git rebase

• Step 1: Keep going git rebase --continue

• Step 2: fix CONFLICTS then git add .

• Back to step 1, now if it says no changes .. then run git rebase --skip and go back to step 1

• If you just want to quit rebase run git rebase --abort

• Once all changes are done run git commit -m "rebase complete" and you are done.

Note: If you don't know what's going on and just want to go back to where the repo was, then just do:

git rebase --abort

Read about rebase: git-rebase doc