Skip to content

Instantly share code, notes, and snippets.

@beaucharman

beaucharman/git-rebase.notes.md

Last active November 1, 2017 17:52
Show Gist options
  • Save beaucharman/4e7a5f0718a8bc6cd137447bc0a3947d to your computer and use it in GitHub Desktop.
Save beaucharman/4e7a5f0718a8bc6cd137447bc0a3947d to your computer and use it in GitHub Desktop.
Download ZIP
Notes: Git rebase process
Raw
git-rebase.notes.md
  1. git checkout <master>
  2. git merge origin <master>
  3. git checkout <feature>
  4. git rebase <master>
  5. deal with any conflicts
  6. git add .
  7. git rebase --continue
  8. git push origin <feature> --force
  9. 😎
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment