源代码管理无法启动手动合并工具，为什么? [英] Source control could not start the manual merge tool, why?

问题描述

我曾经从命令提示符处执行 tf merge $/Alpha/Dev $/Alpha/Main/recursive 来合并从Dev分支到Main分支的更改.在发生冲突时，它会显示解决冲突"窗口，我们可以通过选择选项在合并工具中合并更改

I used to execute tf merge $/Alpha/Dev $/Alpha/Main /recursive from Command Prompt to merge changes from Dev branch to Main branch. On conflicts it shows up Resolve Conflicts window and we could resolve conflicts manually by choosing option Merge changes in Merge Tool

到昨天为止，它运行良好，突然它开始抛出错误，并且没有显示手动合并窗口.

It was working fine till yesterday, all of a sudden it started throwing below error, and not showing the manual merge window.

TF10201源代码管理无法启动手动合并工具.

TF10201 Source control could not start the manual merge tool.

一种奇怪的行为，如果我们以管理员身份打开命令提示符，则可以正常工作.

One strange behavior, it is working fine if we open the Command Prompt as administrator.

请任何人对此有所说明?

Please anyone shed some light on this?

推荐答案

如何还原Microsoft的默认合并工具

如果您在Visual Studio中使用差异/合并工具遇到任何问题，并且正在使用TFS，则可以在此处的菜单中删除现有工具:

If you are having any problems with a diff/merge tool in Visual Studio and you are using TFS you can delete your existing tool in the menu here:

工具-选项-源控制-虚拟工作室团队基础服务器

TOOLS - OPTIONS - SOURCE CONTROL - VISUAL STUDIO TEAM FOUNDATION SERVER

然后单击标题为配置用户工具"的按钮 选择工具，然后单击删除"按钮.这将还原Microsoft默认工具.

Then click the button entitled "Configure User Tools" Select the Tool(s) and hit the REMOVE button. This will restore the Microsoft default tool.

这篇关于源代码管理无法启动手动合并工具，为什么?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！