Created
October 16, 2013 18:22
-
-
Save yangsu/7012406 to your computer and use it in GitHub Desktop.
Force merge git merge conflicts taking master's changes
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
| #!/usr/bin/env bash | |
| for f in $(git status -s | grep "UU\|AA" | sed -E 's/(UU|AA) //'); do | |
| echo $f | |
| TEMP="$f.tmp" | |
| cat $f | sed '/>>>>>>>/d' | sed '/<<<<<<</,/=======/d' > $TEMP | |
| rm $f | |
| mv $TEMP $f | |
| done |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment