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

After a rebase with lots of conflicts (long git status) I couldn't figure out what it was that I was supposed to stage. I use Git integrated with PhpStorm and it didn't show any unstaged files.

git add . didn't solve it but this comment recommended calling git diff-files --ignore-submodules. That showed three files I had to specifically git add and that did the trick.