Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » Merge Tool(How does the Merge Tool compute the diff?)
Merge Tool [message #1058514] Tue, 14 May 2013 07:44 Go to next message
Berno Langer is currently offline Berno Langer
Messages: 2
Registered: July 2009
Junior Member
Hello,

I have merged a branch with command line cgit (because EGit couldn't do it) and the file with the merge conflict looks very clean. But when I raise the Merge Tool to resolve the conflict it has a different view of the conflicts that should be resolved.

index.php/fa/14797/0/

Is it possible to configure the Merge Tool to show the conflicts according to the textual representation?

Greetings,
Berno
Re: Merge Tool [message #1058545 is a reply to message #1058514] Tue, 14 May 2013 08:39 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 556
Registered: July 2009
Senior Member
Choose the option "Use the workspace version of the conflicting files (premerged by Git)" when opening the merge tool
http://wiki.eclipse.org/EGit/User_Guide#Using_Merge_Tool
Re: Merge Tool [message #1058571 is a reply to message #1058545] Tue, 14 May 2013 09:39 Go to previous messageGo to next message
Berno Langer is currently offline Berno Langer
Messages: 2
Registered: July 2009
Junior Member
Thanks, but that doesn't help very much ...

index.php/fa/14827/0/

I would expect just the single line "// Change 5 in master" to be highlighted on the right hand side, so I could copy it in place.
Re: Merge Tool [message #1060209 is a reply to message #1058571] Thu, 23 May 2013 10:09 Go to previous message
Stefan Lay is currently offline Stefan Lay
Messages: 340
Registered: July 2009
Senior Member
The merge tool does not care about the merge done by git. It uses a diff calculation done by eclipse itself.

My rule of thump is:
- Edit the file merged by git directly if git can merge most of the content and leaves only some conflicts
- User the eclipse merge tool if there are many conflicts (choosing the HEAD version on the left hand side)
Previous Topic:Connot install Egit on Eclipse
Next Topic:Egit will not install on Juno
Goto Forum:
  


Current Time: Wed Aug 20 16:44:22 EDT 2014

Powered by FUDForum. Page generated in 0.02354 seconds