README
Don't Commit Conflicts [dot] hks
Its all in the title
About
dont-commit-conflicts.hks is a node-hooks pre-commit hooks that will stop you from ever commiting another conflict. It is simple to use and easy to add to your git projects.
Usage
If you don't have hooks installed
npm install node-hooks -ghooks inithooks install dont-commit-conflicts.hks
If hooks is installed, but not managing you're git-hooks yet
hooks inithooks install dont-commit-conflicts.hks
Else
hooks install esprima.hks