Created
May 6, 2014 04:08
-
-
Save aaronpowell/e7bcb3942848c3a9a67d to your computer and use it in GitHub Desktop.
Handling merge conflicts during a rebase (or any time) when you just want someone's version
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 ss | grep "^UU" | sed 's/UU//' | while read i; do git checkout --theirs $i && git add $i; done | |
| # change `--theirs` to `--ours` to take your own version |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment