Last active
December 8, 2017 02:02
-
-
Save mcfiredrill/2377e325509c1785ab34 to your computer and use it in GitHub Desktop.
handy git aliases for resolving rebase/merge conflicts ref: https://qiita.com/mcfiredrill/items/56dd435c910ef59d2c51
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
$ git rebase origin/master | |
# あ、コンフリクトしちゃった | |
$ git edit-unmerged # コンフリクトしてるファイル$EDITORで開く | |
$ git add-unmerged # コンフリクトしてるファイルをgit addする | |
$ git continue-rebase # rebaseを進む |
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
$ git rebase origin/master | |
# あ、コンフリクトしちゃった | |
$ git edit-unmerged # コンフリクトしてるファイル$EDITORで開く | |
$ git add-unmerged # コンフリクトしてるファイルをgit addする | |
$ git continue-rebase # rebaseを進む |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment