Last active
September 30, 2015 00:06
-
-
Save mario21ic/8584ac6fa6f4a0d5a056 to your computer and use it in GitHub Desktop.
Script to verify conflicts after git merge
This file contains hidden or 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
| #!/usr/bin/env bash | |
| git status | awk '/both modified/ {print $3}'|xargs grep -n "HEAD" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment