It's possible the resolve tool fixed the conflicts for you automatically. It's happened to me (and confused me) before. In this case, you can probably go straight to git rebase --continue
.
The full checklist is:
- if
git status
shows any un-staged changes:- if those files have the chevrons
<<<
>>>
marking conflicts:- fix the conflicts and save the files
- now stage all un-staged changes with
git add
: this marks the conflicts as resolved
- if those files have the chevrons
- now any conflicts are resolved and marked: use
git rebase --continue