Menu
Is it possible to use IntelliJ Diff tool in SourceTree? I know it is accessible from terminal.
Thanks
404
To open the Diff & Merge page, open settings by pressing Ctrl+Alt+S and navigate to Tools | Diff & Merge. Click this button to scroll both differences panes simultaneously.
In Sourcetree for Windows Open Tools/Options/Diff and select and configure the external tools of your choice.
SourceTree config First, open up the options window and go to Diff tab. Change both External Diff Tool and Merge Tool to Custom. In the Diff Command field enter the full path to the vsdiffmerge.exe. For VS 2015 and below you can find it in the Visual Studio installation folder, under Common7\IDE subfolder.
For OSX android studio i've accomplished with this steps:
Open IntelliJ/Android Studio -> Tools -> Create Command Line Launcher
After that, open SourceTree Preferences: and put "/usr/local/bin/studio" in Diff/Merge Command. Like this:
Diff Arguments:
diff $LOCAL $PWD/$REMOTE Merge Arguments:
merge $PWD/$LOCAL $PWD/$REMOTE $PWD/$BASE $PWD/$MERGED And if everything it's ok it should work.
75
Took some time to figure out arguments. Diff command text box should contain path to intellij, like: /Applications/IntelliJ\ IDEA\ 12.app/Contents/MacOS/idea
20
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
