Question

I did a git svn rebase to merge in remote changes and get a conflict. Resolved the conflict manually and tried git rebase --continue, however it didn’t let me do it.

Then I found this:

If it complains about “did you forget to call ‘git add’?”, then
evidently your edit turned the conflict into a no-op change. Do a “git
rebase –skip” to skip it. (Very weird, but true.)

Can anyone explain to me why git rebase --continue didn’t work and I had to do a git rebase --skip?

Answer 1

Just:

git rebase --skip

Because with your merging you don’t mannually change anything.

git rebase --continue only is used when you change the conflicted file in merging.

git rebase --skip is used when you do not change the conflicted file in merging.