change/delete conflict resolution [message #1243760] |
Tue, 11 February 2014 06:55  |
Eclipse User |
|
|
|
Hello,
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.
Any suggestions, please ?
Regards
Vlad Gheorghe
|
|
|
|
Powered by
FUDForum. Page generated in 0.02957 seconds