Skip to content

Instantly share code, notes, and snippets.

@mnichols

mnichols/rebase

Last active December 18, 2015 18:19
Show Gist options
  • Save mnichols/5824878 to your computer and use it in GitHub Desktop.
Save mnichols/5824878 to your computer and use it in GitHub Desktop.
Download ZIP
Rebasing
Raw
rebase
git pull origin {tracking branch} # ie 'dev'
git checkout my-feature
git rebase {tracking branch}
#resolve conflicts
git checkout {tracking branch}
git merge my-feature
git push origin {tracking branch}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment