将 TortoiseMerge 与 Visual Studio 和 TFS 一起使用 - 合并目标(未找到)
我想在 Visual Studio 2010 中将 TortoiseMerge 设置为合并工具。我使用 TFS 进行源代码控制。在 Visual Studio 中,我将 TortoiseMerge 配置为合并工具和 给它指定了此处的参数 /base:%3 /mine:%2 /theirs:%1 /basename:%8 /minename:%7 /theirsname:%6 /merged:%4 /mergedname:%9
当我尝试合并时,合并目标显示未找到它。我缺少什么?
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?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
我已经使用 TortoiseMerge 多年了,并且该消息总是在合并过程中出现。不知道为什么,但合并有效,保存文件有效(认为您已完成合并),最重要的是 VS(或 TF.EXE)会拾取合并的文件并在完成后要求您确认。
好好享受 :-)
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 :-)