Skip to content

Instantly share code, notes, and snippets.

@btorch

btorch/git_fix_conflicts

Created May 8, 2014 13:32
Show Gist options
  • Save btorch/f0104131f0529beb43cc to your computer and use it in GitHub Desktop.
Save btorch/f0104131f0529beb43cc to your computer and use it in GitHub Desktop.
Download ZIP
Rebase steps
Raw
git_fix_conflicts
git checkout master
git pull upstream master
git checkout branch_name
git rebase master
-- conflicts show up
-- fix them
git rebase --continue
-- might have to git commit here, i don't remember
git push origin branch_name
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment