Created
July 14, 2016 10:52
-
-
Save abaicus/58355e2916284ff308726e7c39ad21cd to your computer and use it in GitHub Desktop.
Rebase and Merge Conflict
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 remote add upstream https://github.com/owner/repo.git | |
| git fetch upstream | |
| git rebase upstream/development | |
| /* Solve conflicts */ | |
| git add conflicted-files.extension | |
| git rebase --continue | |
| git push -f origin development |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment