Fernando Godino fgodino
maxmarkus
/ pre-commit-hook-merge-conflicts.sh
Created
March 24, 2016 13:26
Git pre-commit hook to prevent checking in non-resolved merge conflicts.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/bash | |
| # Check for merge conflicts | |
| # Tested on Linux and Mac | |
| # Simple check for merge conflics | |
| conflicts=`git diff --cached --name-only -G"<<<<<|=====|>>>>>"` | |