Eclipse Community Forums - RDF feed
https://www.eclipse.org/forums/
Eclipse Community ForumsMerge/Diff tool
https://www.eclipse.org/forums/index.php/mv/msg/199842/637739/#msg_637739
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]]>Missing name Mising name2010-11-08T15:57:01-00:00Re: Merge/Diff tool
https://www.eclipse.org/forums/index.php/mv/msg/199842/637741/#msg_637741
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)?]]>Christian Halstrick2010-11-08T16:07:49-00:00Re: Merge/Diff tool
https://www.eclipse.org/forums/index.php/mv/msg/199842/637758/#msg_637758
I guess I'll try again later.]]>Missing name Mising name2010-11-08T17:49:04-00:00Re: Merge/Diff tool
https://www.eclipse.org/forums/index.php/mv/msg/199842/637871/#msg_637871
The files are always merged by git and no merge tool is opened....]]>Missing name Mising name2010-11-09T08:55:25-00:00Re: Merge/Diff tool
https://www.eclipse.org/forums/index.php/mv/msg/199842/637982/#msg_637982
http://wiki.eclipse.org/EGit/User_Guide#Using_Merge_Tool]]>Matthias Sohn2010-11-09T14:34:46-00:00Re: Merge/Diff tool
https://www.eclipse.org/forums/index.php/mv/msg/199842/637988/#msg_637988
Missing name Mising name2010-11-09T14:56:57-00:00