Hello,
I try to setup IntelliJ as my External Diff in Source Tree, but I failed.
In Tools -> Options -> Diff:
External Diff Tool: Custom
Diff Command: the path to the idea.exe file in IntelliJ
Arguments: diff $ LCOAL $REMOTE
When I right click the file need to merge the conflics, there is a window disappeared very quickly.
Would anyone please give me some suggestions? Thank you very much!
I found this but still can't get it working. IJ seems to close without opening the merge window. http://stackoverflow.com/questions/14774053/intellij-diff-tool-in-sourcetree
You will need to use a launcher script:
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.