Team Foundation Server 合并未合并 [英] Team Foundation Server merge not merging

问题描述

为什么 TFS 不想把我的旧文件还给我?

Why does TFS not want to give me my old files back?

开发分支

主分支

将 Dev 合并到 Main

鉴于下面的第一个答案和更多调查，我相信我正在尝试完成整个分支覆盖.这可能吗?

Given the first answer below and some more investigation, I believe I am trying to accomplish an entire branch overwrite. Is this possible?

推荐答案

这是一个很好的方案，我认为最好的办法是取消删除 Main 分支中的文件和文件夹.为此，请进入工具"、选项".展开源代码管理"，选择Visual Studio Team Foundation Server"并勾选在源代码管理资源管理器中显示已删除的项目"

This is a good one, I think the best thing to do would be to undelete the files and folders in the Main branch. To do this go in to "Tools", "options". The expand "Source Control", Select "Visual Studio Team Foundation Server" and check "Show deleted items in the Source Control Explorer"

这将允许您选择已删除的文件并使用取消删除"命令将它们取回.

This will allow you to select the deleted files and use the "undelete" command to get them back.

但是，如果您真的想将更改从 dev 分支推送到主分支，那么您可以使用命令行强制 TFS 进行合并.

However if you really want to push the changes from your dev branch to the main branch then you might be able to use the command line to force TFS to do the merge.

打开 Visual Studio 2010 命令提示符并导航到您的工作区

Open a Visual Studio 2010 command prompt and navigate to your workspace

例如cd c:\tfs\MyLocalWorkspace

然后使用tf"命令

<代码>tf 合并 $/TeamProject/Dev $/TeamProject/Main/recursive/force

这将强制 TFS 合并更改，即使它认为它们之前已被合并.我可能会说使用取消删除"是导致奇怪的事情"在未来发生的最不可能的方法.

This will force TFS to merge the changes even if it thinks they've been merged before. I would probably say that using "undelete" is the least likely method to cause "wierd stuff" from happening in the future.

这篇关于Team Foundation Server 合并未合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！