代码之家 › 专栏 › 技术社区 › jessehouwing

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

git-tower visual-studio-2017 visual-studio git

jessehouwing · 技术社区 · 6 年前

我想使用Visual Studio作为Tower中的默认合并工具。我看过安装程序附带的docs和comparetools.json,但不幸的是 vsDiffMerge /? 没有提供任何有用的关于参数去哪里的信息。

1 回复 | 直到 6 年前

jessehouwing 6 年前

要将Visual Studio 2017配置为Tower中的合并工具,请将 vs2017.json in the following directory: %localappdata%\fournova\tower\settings\comparetools\ 。


   
    
     
      
       设置以下内容并在需要时调整Visual Studio搜索路径:
      
      。{
“displayname”:“Visual Studio 2017”,
“minimumVersion”:“”,
“支持DiffChangeSet”:真,
“SupportsDirectoryDiff”:错误,
“difftoolarguments”:“\”$local\“$remote/t”,
“mergetoolarguments”:“\”$remote\“\”$local\“\”$base\“\”$merged\“/m”,
“ApplicationRegistryIdentifiers”:。[
,
“应用程序路径”:。[
%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\\team explorer\\common7\\ide\\commonextensions\\microsoft\\teamfoundation\\teamexplorer\\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\\team explorer\\common7\\ide\\commonextensions\\microsoft\\teamfoundation\\teamexplorer\\vsdiffmerge.exe
]
}

重新启动Tower,然后在“首选项”窗口中选择Visual Studio:。



另请参见:


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



设置以下内容并在需要时调整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,然后在“首选项”窗口中选择Visual Studio:



另请参见:


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