At a merge I have a conflict on a file where the file was changed on the local branch and deleted on the remote branch.
The workspace version contains the contents from the local branch.
I would like to accept the incoming deletion, but I could not find out how.
- If I delete the file from the workspace, the file cannot be staged (add to index has no effect).
- There is no "delete" context action in the stagig view for the respective file.
As a work-around, I commit the file with empty contents (or with a single line : <<TO DELETE>> ), commit the merge, and then do another normal commit where I actually delete it.
This sounds like some features are missing, or are really hard to find.
I am in the same situation including not being able to find a command in EGit to accept the incoming deletion. It's too bad that this question got no answers in 3 years.
I'm using Neon.2 with EGit 126.96.36.199703071140-r .
In the staging view I can right-click the file and although the file was deleted from "Theirs" I still have the "Replace With - Theirs", so I thought that's what I was looking for, selecting that option will also delete the file from "Mine", that is accept the incoming deletion. But when I click it, it's just as I hadn't clicked it, nothing at all visibly happens.
I cannot find anything else that seems to do this, so I'm still stuck with workarounds.