Eclipse Community Forums: EGit / JGit » External merge tool with git

Home » Eclipse Projects » EGit / JGit » External merge tool with git(How to use an external merge tool when using git on eclipse?)

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

External merge tool with git [message #1436902]

Fri, 03 October 2014 15:31

Alexandre Cabrera

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.

Report message to a moderator

Re: External merge tool with git [message #1437147 is a reply to message #1436902]

Sat, 04 October 2014 00:01

Matthias Sohn

Messages: 1268
Registered: July 2009

Senior Member

See http://git-scm.com/docs/git-mergetool

kdiff3: http://naleid.com/blog/2012/01/12/how-to-use-kdiff3-as-a-3-way-merge-tool-with-mercurial-git-and-tower-app
p4merge: http://naleid.com/blog/2013/10/29/how-to-use-p4merge-as-a-3-way-merge-tool-with-git-and-tower-dot-app

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).

Report message to a moderator

Previous Topic:	Help with git/Egit (noob here), can't push project
Next Topic:	Commands to import archive zip into new repository

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Thu Apr 25 08:33:42 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter