Created
March 13, 2013 16:41
-
-
Save madx/5153931 to your computer and use it in GitHub Desktop.
Speed up conflict resolution in Git!
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
| [alias] | |
| resolve = !sh -c 'git conflicts && $EDITOR $(git conflicts) +\"/<<<<\"' | |
| conflicts = !sh -c 'git status -sb | grep ^UU | sed "s/UU\\ //"' |
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
| # After a failed rebase/merge | |
| $ git resolve | |
| ... resolve the conflicts ... | |
| $ git add $(git conflicts) | |
| $ git rebase --continue # or equivalent |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment