Eclipse Community Forums: EGit / JGit

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

Tue, 14 May 2013 07:44

Eclipse User

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 19951 times)

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

Tue, 14 May 2013 08:39

Eclipse User

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

Eclipse User

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 20102 times)

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

Thu, 23 May 2013 10:09

Eclipse User

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)

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

Wed, 23 December 2015 10:44

Eclipse User

I have the same question. Berno, do you finally get a solution?

Previous Topic:	Create Listener for Git Event using EGIT-plugins
Next Topic:	Referencing multiple repository sources

Goto Forum:

-=] Back to Top [=-

Current Time: Sat Nov 22 17:12:13 EST 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter