In my Source Tree "External Diff/Merge" settings, I have the following entries
Merge Tool: "D:\Program Files\IntelliJ IDEA Community Edition 12.1.2\bin\idea.bat"
Arguments: merge $LOCAL $REMOTE $MERGED
If I were to run the following command from the Windows command line, my merge tool (IntelliJ) would fire up normally (note that "a.txt", "b.txt", and "c.txt" are dummy filenames):
"D:\Program Files\IntelliJ IDEA Community Edition 12.1.2\bin\idea.bat" a.txt b.txt c.txt
However, in SourceTree, the merge tool will to fire up. Sometimes, I can even see IntelliJ running in my task manager, and I can see the files SourceTree generates for diffing. But the files will suddenly dissappear, the IntelliJ process dies, and nothing happens in SourceTree.
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
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