Skip to content

Instantly share code, notes, and snippets.

@wayneeseguin

wayneeseguin/pre-commit

Forked from jhsu/pre-commit
Created March 16, 2010 17:46
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save wayneeseguin/334287 to your computer and use it in GitHub Desktop.
Save wayneeseguin/334287 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
pre-commit
#!/bin/bash
# Merge conflict check.
if grep -iR "<<<<<<" ./* || grep -iR ">>>>>" ./* ; then
echo "\nERROR:\nYou have merge conflicts. \nPlease resolve them and try again.\n"
exit 1
fi
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment