Cannot open IntelliJ as a External Diff in SourceTree

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!

1 answer

This widget could not be displayed.

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

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Published 7 hours ago in Bitbucket

Branch Management with Bitbucket

As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...

36 views 0 5
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you