Resolve “CONFLICT (delete/modify)” in git

by

I also had the scenario

**CONFLICT (modify/delete):***FileName deleted in HEAD and modified in 6efb2a94ba0601aa1ec5050ab222a0359ee8379a. Version 6efb2a94ba0601aa1ec5050ab222a0359ee8379a of FileName left in tree.*

I was also equally confused and reached this post.
But on typing git status, all doubts are vanished. git status, stated the following about the conflicted files:

Unmerged paths:
(use “git add/rm …” as appropriate to mark resolution)

So I just did git rm FileName, and after that the CONFLICT got resolved.

Leave a Comment