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!
Hey there Community! Atlassian Open is kicking off in less than a month and we can't wait to touch down in Vienna, Sydney and Boston. This is an opportunity to create the future of teamwork with ...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events