如何在 Tower 中使用 Visual Studio 作为合并工具

Question

我想使用 Visual Studio 作为 Tower 中的默认合并工具。我查看了安装程序随附的文档和 comparetools.jsons，但不幸的是 vsDiffMerge /? 没有提供任何有关参数位置的有用信息。

Answer 1

要将 Visual Studio 2017 配置为您在 Tower 中的合并工具，请将 vs2017.json 放在以下目录中：%LOCALAPPDATA%\fournova\Tower\Settings\CompareTools\

设置如下内容，需要时调整Visual Studio搜索路径：

{
  "DisplayName":           "Visual Studio 2017",
  "MinimumVersion":        "",
  "SupportsDiffChangeset": true,
  "SupportsDirectoryDiff": false,
  "DiffToolArguments":     "\"$LOCAL\" $REMOTE /t",
  "MergeToolArguments":    "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" /m",
  "ApplicationRegistryIdentifiers": [
  ],
  "ApplicationPaths": [
      "%ProgramFiles(x86)%\Microsoft Visual Studio\Preview\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe",
      "%ProgramFiles(x86)%\Microsoft Visual Studio\Preview\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe",
      "%ProgramFiles(x86)%\Microsoft Visual Studio\Preview\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe",  
      "%ProgramFiles(x86)%\Microsoft Visual Studio\Preview\TeamExplorer\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe",  
      "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe",
      "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe",
      "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe",
      "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\TeamExplorer\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\vsDiffMerge.exe"
  ]
}

重新启动 Tower，然后在首选项中 select Visual Studio window:

另请参阅：

https://jessehouwing.net/visual-studio-2017-merge-tool-in-tower/

如何在 Tower 中使用 Visual Studio 作为合并工具

How to use Visual Studio as your merge tool in Tower

git

visual-studio

git-tower

visual-studio-2017