Git rebase merge conflict cannot continue

Question

I\'m trying to rebase \'dev\' to catch up to \'master\' branch.

$ git checkout dev 
$ git rebase master 
First, rewinding head to replay your work on top of it.         


        

Answer 1

$ vi src/com....      { verified, no >>> or <<< left, no merge markers } 
$ git rebase --continue 

Looks like you forgot to git add your changes...