Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » Merge/Diff tool(Egit, merge)
icon5.gif  Merge/Diff tool [message #637739] Mon, 08 November 2010 15:57 Go to next message
Glasn Host is currently offline Glasn HostFriend
Messages: 5
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
Re: Merge/Diff tool [message #637741 is a reply to message #637739] Mon, 08 November 2010 16:07 Go to previous messageGo to next message
Christian Halstrick is currently offline Christian HalstrickFriend
Messages: 113
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
Re: Merge/Diff tool [message #637758 is a reply to message #637741] Mon, 08 November 2010 17:49 Go to previous messageGo to next message
Glasn Host is currently offline Glasn HostFriend
Messages: 5
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.
Re: Merge/Diff tool [message #637871 is a reply to message #637741] Tue, 09 November 2010 08:55 Go to previous messageGo to next message
Glasn Host is currently offline Glasn HostFriend
Messages: 5
Registered: November 2010
Junior Member
Hi, I've installed the nightly build 0.10.0.201011082123, but still no luck.
The files are always merged by git and no merge tool is opened....
Re: Merge/Diff tool [message #637982 is a reply to message #637871] Tue, 09 November 2010 14:34 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 612
Registered: July 2009
Senior Member
It's not yet opened automatically, see http://wiki.eclipse.org/EGit/User_Guide#Using_Merge_Tool
Re: Merge/Diff tool [message #637988 is a reply to message #637982] Tue, 09 November 2010 14:56 Go to previous message
Glasn Host is currently offline Glasn HostFriend
Messages: 5
Registered: November 2010
Junior Member
Great, thanks!
Previous Topic:Install not working properly?
Next Topic:Displaying branches and tags in the history view
Goto Forum:
  


Current Time: Thu Nov 27 07:07:54 GMT 2014

Powered by FUDForum. Page generated in 0.02108 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software