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

One of the times that I have run into this issue is when doing a git commit after a git add. So, the following sequence will produce the rebase error you mention:

git add
git commit -m ""
git rebase --continue

While, the sequence below runs without any errors, and continues the rebase:
git add
git rebase --continue

It might be possible that git add -A with the "All" option is creating a similar situation. (Please note, I am very inexperienced in git, so this answer may not be correct.) To be safe, the git rebase --skip seems to also work well in this situation.