Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Newcomers » Newcomers » External merge tool with git(How to use an external merge tool when using git on eclipse?)
External merge tool with git [message #1436950] Fri, 03 October 2014 17:02 Go to next message
Alexandre Cabrera is currently offline Alexandre CabreraFriend
Messages: 2
Registered: October 2014
Junior Member
Is there a way to use an external merge tool when using git on eclipse?
I'd like to use meld or kdiff3 to do the merging.
Re: External merge tool with git [message #1437120 is a reply to message #1436950] Fri, 03 October 2014 23:13 Go to previous message
Russell Bateman is currently offline Russell BatemanFriend
Messages: 3798
Registered: July 2009
Location: Provo, Utah, USA
Senior Member

On 10/03/2014 12:00 PM, Alexandre Cabrera wrote:
> Is there a way to use an external merge tool when using git on eclipse?
> I'd like to use meld or kdiff3 to do the merging.

Eclipse is remarkably robust with respect to changes made to files
"under its control" but occurring outside its control.

I, for one, do not use eGit, but always git at the command line.
Consequently, I use gitk and other tools.

So, in short, the answer to your question is yes, feel free to do stuff
outside Eclipse. At worst, you'll need to manually refresh the project
contents, but likely Eclipse will recognize the changes and tell you
about them in the open editor windows.
Previous Topic:Re: Help with git/Egit (noob here), can't push project
Next Topic:Eclipse Programming remote on ftp-server
Goto Forum:
  


Current Time: Wed Nov 20 00:06:31 GMT 2019

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

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

Back to the top