Eclipse Community Forums: EGit / JGit

Help

Home

Home » Eclipse Projects » EGit / JGit » Merge Tool(How does the Merge Tool compute the diff?)

Show: Today's Messages :: Show Polls :: Message Navigator

Merge Tool [message #1058514]

Tue, 14 May 2013 11:44

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

Attachment: merge-tool.png
(Size: 96.72KB, Downloaded 19655 times)

Report message to a moderator

Re: Merge Tool [message #1058545 is a reply to message #1058514]

Tue, 14 May 2013 12:39

Matthias Sohn

Messages: 1268
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

Report message to a moderator

Re: Merge Tool [message #1058571 is a reply to message #1058545]

Tue, 14 May 2013 13:39

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.

Attachment: merge-tool2.png
(Size: 73.07KB, Downloaded 19694 times)

Report message to a moderator

Re: Merge Tool [message #1060209 is a reply to message #1058571]

Thu, 23 May 2013 14:09

Stefan Lay

Messages: 342
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)

Report message to a moderator