# Interactive rebase, replace 4 with number of commits into the past you'd like to rebase
git rebase -i HEAD~4
# To resolve merge conflicts
git fetch [remote org]
git pull -—rebase [remote org] master
# Open a text editor (like Atom), detect and resolve conflicts
git rebase -—continue
Created
September 18, 2018 17:36
-
-
Save apaskulin/67783e4d266d374aeda0b806aed4fe63 to your computer and use it in GitHub Desktop.
Git Cheat Sheet
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment