SourceTree中的IntelliJ Diff工具

Question

是否可以在SourceTree中使用IntelliJ Diff工具？我知道它可以从终端访问.

谢谢

Answer 1

对于OSX android studio我完成了这个步骤:

打开IntelliJ/Android Studio - >工具 - >创建命令行启动器

之后,打开SourceTree Preferences:并将"/ usr/local/bin/studio"放入Diff/Merge Command.像这样:

差异参数:

diff $LOCAL $PWD/$REMOTE

合并参数:

merge $PWD/$LOCAL $PWD/$REMOTE $PWD/$BASE $PWD/$MERGED

如果一切都好,它应该工作.

Answer 2

花了一些时间来弄清楚论点.Diff命令文本框应包含intellij的路径,如:/Applications/IntelliJ\ IDEA\ 12.app/Contents/MacOS/idea

Answer 3

Windows
Diff命令:C:\Program Files (x86)\JetBrains\IntelliJ IDEA 12.1.2\bin\idea.exe
参数:diff $LOCAL $PWD/$REMOTE

合并命令:C:\Program Files (x86)\JetBrains\IntelliJ IDEA 12.1.2\bin\idea.exe
参数:( 这对我来说不合适.我遇到了路径问题.) merge $LOCAL $PWD/$REMOTE $PWD/$BASE $MERGED

从12.1开始,这些是从程序外部使用IntelliJ的差异和合并工具的参数:

差异工具
<path to IntelliJ IDEA launcher> diff <path to file1> <path to file2>

合并工具
<path to IntelliJ IDEA launcher> merge <path to file1> <path to file2> <path to file3> <path to output>

官方文档:running-intellij-idea-as-a-diff-or-merge-command-line-tool

FWIW,我最终使用IntelliJ作为源代码控制.我比Sourcetree更喜欢它.它非常强大.

Answer 4

如果有人对Mac中的Android Studio设置感兴趣:

<path to IntelliJ IDEA launcher>:
/Applications/Android\ Studio.app/Contents/MacOS/studio

Diff tool
<path to IntelliJ IDEA launcher> diff <path to file1> <path to file2>

Merge tool
<path to IntelliJ IDEA launcher> merge <path to file1> <path to file2> <path to file3> <path to output>

我注意到的唯一问题是Android Studio不能同时显示多于1个差异.当我尝试时,它抱怨文件无法显示

Answer 5

在Mac上与intellij 2016

diff $LOCAL $PWD/$REMOTE

merge $PWD/$LOCAL $PWD/$REMOTE $PWD/$BASE $PWD/$MERGED

Answer 6

对于今天（2019年1月），它可以在如下窗口中运行：

外部差异/合并：

差异工具：

Diff Command: C:\Program Files\JetBrains\WebStorm 2018.3.1\bin\webstorm64.exe

Agruments: diff $LOCAL $REMOTE

合并工具：

Diff Command: C:\Program Files\JetBrains\WebStorm 2018.3.1\bin\webstorm64.exe

Agruments: merge $LOCAL $REMOTE $BASE $MERGED