From c5cb3f2e4014e0c42407dfabfb3f011db2b7237b Mon Sep 17 00:00:00 2001
From: Michael Lee <lee.5151@osu.edu>
Date: Wed, 28 Sep 2022 11:05:04 -0400
Subject: [PATCH] update tmux-parallel-push merge-conflict code
---
scripts/tmux-parallel-push.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/tmux-parallel-push.sh b/scripts/tmux-parallel-push.sh
index 9a1cbc1e34..ecc4ea4619 100755
--- a/scripts/tmux-parallel-push.sh
+++ b/scripts/tmux-parallel-push.sh
@@ -55,8 +55,8 @@
MERGE_ERR=$(grep -rnw './' -e "Merge conflict");
if [[ -n ${MERGE_ERR} ]];
then
- echo; echo "It looks there were some errors. Review merge-conflicts.txt for more information."; echo;
- echo "$MERGE_ERR" > ./merge-conflicts.txt;
+ echo; echo "It looks there were some errors. Review _merge-conflicts.txt for more information."; echo;
+ echo "$MERGE_ERR" > ./_merge-conflicts.txt;
else
echo; echo "No automatic merge issues detected. Success?"; echo;
fi
--
GitLab