Last active
January 29, 2017 12:17
-
-
Save ManWithBear/f356484b2ba8808d97582e20c66e5ad8 to your computer and use it in GitHub Desktop.
Rebase workflow commands
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
git checkout { your branch } | |
git checkout -b tmp | |
git checkout develop | |
git pull | |
git rebase develop { your branch } | |
{ complete all rebase steps } | |
git checkout develop | |
git merge --no-ff { your branch } | |
git push | |
git checkout { your branch } | |
git merge develop | |
git push -f | |
git branch -D tmp |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment