Created
November 2, 2016 05:50
-
-
Save ishikawa/af14c45b798830341bdb52665ef68999 to your computer and use it in GitHub Desktop.
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
| # Checkout theirs unmerged files and continue rebase | |
| git ls-files --unmerged | awk '{ print $4 }' | uniq | xargs git checkout --theirs -- | |
| git ls-files --unmerged | awk '{ print $4 }' | uniq | xargs git add -- | |
| git rebase --continue |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment