walf443 · December 18, 2015 10:49
diff --git a/check_conflict.sh b/check_conflict.sh
 #!/bin/bash

 exec 1>&2
 git status --porcelain | cut -f3 -d ' ' | xargs -I% cat % | grep -A 3 -B 3 '<<<<< HEAD' && echo "********************** WARNING ***********************" && echo "                  CONFLICT MARKER FOUND" && echo "******************************************************" && exit 1

 exit 0
	#!/bin/bash

	exec 1>&2
	git status --porcelain \| cut -f3 -d ' ' \| xargs -I% cat % \| grep -A 3 -B 3 '<<<<< HEAD' && echo "******************** WARNING *******************" && echo " CONFLICT MARKER FOUND" && echo "****************************************************" && exit 1

	exit 0