Git rebase will not continue after a delete/modify conflict

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.

Leave a Comment