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

There are a couple situations where I've seen rebase get stuck. One is if the changes become null (a commit has changes that were already made previously in the rebase) in which case you may have to use git rebase --skip.

It's pretty easy to tell. If you do git status it should show no changes. If so just skip it. If that isn't the case please post a copy of git status and I can try to help further.