beaucharman/git-rebase.notes.md

Last active November 1, 2017 17:52

Star (1) You must be signed in to star a gist
Fork (1) You must be signed in to fork a gist

Select an option

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/beaucharman/4e7a5f0718a8bc6cd137447bc0a3947d.js"></script>
Save beaucharman/4e7a5f0718a8bc6cd137447bc0a3947d to your computer and use it in GitHub Desktop.

Download ZIP

Notes: Git rebase process

Raw

git-rebase.notes.md

git checkout <master>
git merge origin <master>
git checkout <feature>
git rebase <master>
deal with any conflicts
git add .
git rebase --continue
git push origin <feature> --force
😎

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment