Merge conflict tool outside of Idea ?
Hi,
I really like the merging tool in Idea when I have to resolve some merge conflicts. Sometimes, I have to do some cvs branch merging via the command line on Linux and I was wondering if it's somehow possible to use the merge conflict tool of Idea on the conflicts created by the "cvs" command line tool. In other words, is it possible to use this tool as a standalone tool ?
cheers,
Tex
Please sign in to leave a comment.
We have a request for this enhancement, please vote for http://youtrack.jetbrains.net/issue/IDEA-69292.
ok,
cheers
In the meantime you should try P4Merge, it is free and one of the best diff/merge tools in my opinion.
They don't seen to have a Linux version :(
Of course they have
Windows, Linux, Mac and Unix: http://perforce.com/downloads/complete_list
Well if I chose the "Visual Merge Tool" it's only listed in Windows
Browse by component > Clients > Visual Merge Tool
Ah, sorry, maybe I should have mentioned that it is part of the P4V package.
Just download and unzip that and you have p4v and p4merge
ok I have it now. Thanks
So at the moment is not possible to delegate merge conflicts for an external tool, like p4merge right?
The question here was the other way round, to use the IDEA merge tool from outside.
You can setup p4merge as external diff tool in IDEA, but I'm not sure whether this is used for merging also.