Created
May 17, 2017 08:00
-
-
Save ngtrieuvi92/257b9693f98db88ca9926e85f3609f28 to your computer and use it in GitHub Desktop.
checkout --our all conflict file
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
| git status -s | grep ^U | awk '{print $2}' | xargs git checkout --ours | |
| git status -s | grep ^U | awk '{print $2}' | xargs git add | |
| git commit |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment