Skip to content
Snippets Groups Projects
Commit c5cb3f2e authored by Michael Lee's avatar Michael Lee
Browse files

update tmux-parallel-push merge-conflict code

parent cd9cfbd8
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment