IntelliJ Diff Tool in SourceTree

git intellij-idea diff atlassian-sourcetree
ThanksBro picture ThanksBro · Feb 8, 2013 · Viewed 15.4k times · Source

Is it possible to use IntelliJ Diff tool in SourceTree? I know it is accessible from terminal.

Thanks

Answer

firetrap picture firetrap · Jul 26, 2016

For OSX android studio i've accomplished with this steps:

Open IntelliJ/Android Studio -> Tools -> Create Command Line Launcher

Something like this:

After that, open SourceTree Preferences: and put "/usr/local/bin/studio" in Diff/Merge Command. Like this:

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.

Related questions

What to gitignore from the .idea folder?

Possible Duplicate: Intellij Idea 9/10, what folders to check into (or not check into) source control? I started using WebStorm for web development and am not sure what to add and what to exclude from our Git repository. Clearly some files …

Read More
unable to remove file that really exists - fatal: pathspec ... did not match any files

unable to remove file that really exists - fatal: pathspec ... did not match any files I have a file under git control that simply will not be deleted. The failing command is: $ git rm .idea/workspace.xml fatal: pathspec '.…

Read More
Change remote repository credentials (authentication) on Intellij IDEA 14

I recently changed my Bitbucket password for security reasons. However, IntelliJ didn't update my repository to the new credentials, so it stops me from pulling/pushing anything to my repository. I am not using any plugins for this, just the …

Read More