Git rebase will not continue after a delete/modify conflict

I hit this when a commit added a binary file that conflicted with an existing file.

I got by it by:

• deleting the existing file,
• making a single character change to a comment in a different file, and
• "git add" ing that irrelevant change.

Git was happy again. :)

When all else fails, read the message.

This patch is trying to modify two files, but they have already been deleted; deleting them again did nothing.

Just run git rebase --skip.

do git add -A followed by git rebase --continue. This should add all changes - including your removal of the files and then continue.

There is no guarantee that the commit didn't have other files that did not conflict and should be merged. git rebase --skip would lose those files. You don't want that.