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!
Every team in the world is unique, and so Atlassian believes that each and every team's best way of working needs to be molded to their unique circumstances – ...
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!
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot