git-svn cannot rebase because of files that exist only in git repository, not in svn

When I do a git svn rebase, it te开发者_如何学编程lls me that it had a CONFLICT (add/add) in a file that's not even in the SVN repository, I added it after my initial git clone. When I fire up meld, my favorite merge tool, I see two versions of the file, one more recent than the other. So I resolve the merge conflict by taking all the changes for the more recent version, and do a 'git add' on the file. Git status does not show the change staged for commit, and git rebase --continue says: No changes - did you forget to use 'git add'?

What's going on? What have I done wrong? Why won't this merge?

It's just that you've resolved the conflict to the state that HEAD was at already. When you see that after resolving the conflict and git adding the file your git status is clean or git rebase --continue tells you there are no changes, it's safe to just move on with git rebase --skip.