Created
December 11, 2014 10:17
-
-
Save Swop/6a5f1999e1a04227e382 to your computer and use it in GitHub Desktop.
Git merge test command (to detect potential 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 | |
| git config --global alias.mergetest '!f(){ git merge --no-commit --no-ff "$1"; git merge --abort; echo "Merge aborted"; };f ' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Thanks.