Created
October 5, 2017 16:16
-
-
Save nbassler/bbec361a09119f78588b07855da848e1 to your computer and use it in GitHub Desktop.
rebasing
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
| How to rebase: | |
| go to branch to be rebased | |
| $ git rebase master | |
| in case of conflict, fix/edit the file | |
| $ git add file | |
| $ git rebase --continue | |
| repeat until nothing more to be applied. | |
| git push feature/111-mybranch --force |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment