Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » change/delete conflict resolution
change/delete conflict resolution [message #1243760] Tue, 11 February 2014 06:55
Vlad Gheorghe is currently offline Vlad Gheorghe
Messages: 111
Registered: May 2011
Senior Member
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

Previous Topic:Marketplace always shows update available
Next Topic:Egit and submodules [RESOLVED]
Goto Forum:
  


Current Time: Sat Aug 23 11:31:37 EDT 2014

Powered by FUDForum. Page generated in 0.02500 seconds