|Re: External merge tool with git [message #1437120 is a reply to message #1436950]
||Fri, 03 October 2014 23:13
| Russell Bateman
Registered: July 2009
Location: Provo, Utah, USA
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.
Powered by FUDForum
. Page generated in 0.02915 seconds