将 TortoiseMerge 与 Visual Studio 和 TFS 结合使用 - 合并目标(未找到) [英] Using TortoiseMerge with Visual Studio and TFS - Merge Target (not found)

问题描述

我想在 Visual Studio 2010 中将 TortoiseMerge 设置为合并工具.我使用 TFS 进行源代码控制.在 Visual Studio 中，我将 TortoiseMerge 配置为一个合并工具，并且 在这里指定参数 /base:%3/mine:%2/theirs:%1/basename:%8/minename:%7/theirsname:%6/merged:%4/mergedname:%9

当我尝试合并时，合并目标显示未找到.我错过了什么?

解决方案

我多年来一直在使用 TortoiseMerge，并且在合并期间总是出现该消息.不知道为什么，但合并有效，保存文件有效(这被认为你已经完成了合并)，最重要的是 VS(或 TF.EXE)选择合并的文件并在你完成后要求你确认.

享受吧:-)

I want to set up TortoiseMerge as a merge tool in Visual Studio 2010. I'm using TFS for source control. In Visual Studio I configured TortoiseMerge to be a merge tool and gave it parameters specified here /base:%3 /mine:%2 /theirs:%1 /basename:%8 /minename:%7 /theirsname:%6 /merged:%4 /mergedname:%9

When I try to merge, the Merge Target says that it is not found. What am I missing?

解决方案

I have been using TortoiseMerge for years and that message always appears during merge. Not sure why, but merging works, saving the file works (it's considered you've done the merge) and most importantly VS (or TF.EXE) picks up the merged file and asks you for confirmation when you're done.

Enjoy it :-)

这篇关于将 TortoiseMerge 与 Visual Studio 和 TFS 结合使用 - 合并目标(未找到)的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！