From e67d6b00df2918d627b538bc8a078d214ae6c495 Mon Sep 17 00:00:00 2001
From: Michael Lee <lee.5151@osu.edu>
Date: Wed, 27 Apr 2022 13:42:06 -0400
Subject: [PATCH] add merge conflict check
---
scripts/tmux-parallel-push.sh | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/scripts/tmux-parallel-push.sh b/scripts/tmux-parallel-push.sh
index 73c28aabd1..9a1cbc1e34 100755
--- a/scripts/tmux-parallel-push.sh
+++ b/scripts/tmux-parallel-push.sh
@@ -51,6 +51,15 @@
cd $LOG_DIR;
wc -l * | sort -n | tee line-counts.txt;
+
+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;
+else
+ echo; echo "No automatic merge issues detected. Success?"; echo;
+fi
cd ..;
echo; echo; echo "Sleeping for 11 more seconds..."; echo; echo;
--
GitLab