Created
June 8, 2016 17:22
-
-
Save mkoller/eb8881437b8ada4b2e5e7dc35f721bda to your computer and use it in GitHub Desktop.
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 pull --rebase | |
| # $ git pull origin master --rebase | |
| # in sequence | |
| git mergetool | |
| git add conflict_file | |
| git rebase --continue |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment