Skip to main content

Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » External merge tool with git(How to use an external merge tool when using git on eclipse?)
External merge tool with git [message #1436902] Fri, 03 October 2014 15:31 Go to next message
Alexandre Cabrera is currently offline Alexandre CabreraFriend
Messages: 2
Registered: October 2014
Junior Member
I need to use an external merge tool to compare the conflicts and I only found out how to do this using SVN, with GIT I still haven't figured out how to do it.
Re: External merge tool with git [message #1437147 is a reply to message #1436902] Sat, 04 October 2014 00:01 Go to previous message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 1138
Registered: July 2009
Senior Member


EGit doesn't support external merge tools, so in Eclipse use EGit's built-in merge tool (click "Merge Tool" on conflicting file
in staging view).
Previous Topic:Help with git/Egit (noob here), can't push project
Next Topic:Commands to import archive zip into new repository
Goto Forum:

Current Time: Wed Jun 03 19:51:33 GMT 2020

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

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

Back to the top