|
Re: change/delete conflict resolution [message #1756263 is a reply to message #1243760] |
Tue, 14 March 2017 16:03 |
|
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 4.6.1.201703071140-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.
|
|
|
Powered by
FUDForum. Page generated in 0.04051 seconds