如何将 SourceGear DiffMerge 设置为 Visual Studio 的差异/合并工具? [英] How to set up SourceGear DiffMerge as the diff/merge tool for Visual Studio?

问题描述

我使用 TFS 进行源代码管理，但我想使用 SourceGear DiffMerge 来查看文件差异和进行合并.我找到了工具 -> 选项 -> 源代码管理 -> Visual Studio Team Foundation Server -> 配置用户工具对话框，但是设置合并参数非常混乱.这些参数应该是什么?

I am using TFS for source control, but I want to use SourceGear DiffMerge for viewing file differences and doing merges. I found the Tools -> Options -> Source Control -> Visual Studio Team Foundation Server -> Configure User Tools dialog, but setting up the merge parameters is very confusing. What should those parameters be?

推荐答案

首先需要将默认命令行改为:

Firstly, you need to change the default command line to:

C:\Program Files (x86)\SourceGear\Vault Client\sgdm.exe

C:\Program Files (x86)\SourceGear\Vault Client\sgdm.exe

我在 SourceGear 上的此线程中找到了参数支持论坛，但那里给出的参数不正确，导致自动合并被反向执行，即旧代码覆盖新代码.正确的论据是:

I found the parameters in this thread on the SourceGear support forums, but the arguments given there are incorrect and result in the auto-merge being executed in reverse, i.e. old code overwrites new code. The correct arguments are:

/m/t1=%6/t2=%7/t3=%8/c=%9 %1 %3 %2/r=%4

/m /t1=%6 /t2=%7 /t3=%8 /c=%9 %1 %3 %2 /r=%4

这篇关于如何将 SourceGear DiffMerge 设置为 Visual Studio 的差异/合并工具?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！