Eclipse Community Forums: EGit / JGit

Help

Home

Home » Eclipse Projects » EGit / JGit » Merge/Diff tool(Egit, merge)

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

Merge/Diff tool [message #637739]

Mon, 08 November 2010 15:57

Missing name Mising name

Messages: 6
Registered: November 2010

Junior Member

I'm using egit on Eclipse-Galileo.
When I perform a merge on conflicting files, the result is shown Git-style, i.e. with inserted lines and comments, which I don't like.

Even if in the EGit preferences the Merge Tool Content is defined as "Ask the user when the tool is started", I always get what I think is the pre-merged Git result.

Isnt'it possible to configure EGit to use a different tool, like the built-in eclipse compare, or even an external one?

thanks

Report message to a moderator

Re: Merge/Diff tool [message #637741 is a reply to message #637739]

Mon, 08 November 2010 16:07

Christian Halstrick

Messages: 274
Registered: July 2009

Senior Member

The change http://egit.eclipse.org/r/#change,1801 has introduced that you can use the eclipse builtin diff/merge tools to resolve conflicts. Have you tried that version of EGit (e.g. by installing our nightly build)?

Ciao
Chris

Report message to a moderator

Re: Merge/Diff tool [message #637758 is a reply to message #637741]

Mon, 08 November 2010 17:49

Missing name Mising name

Messages: 6
Registered: November 2010

Junior Member

Thanks, I was trying the stable version. I'm trying to install now the nightly update, but it seems that it's not always available (Artifact not found???).
I guess I'll try again later.

Report message to a moderator