TFS Merging 不断合并一些文件，没有任何更改
由于某种未知的原因，TFS 似乎一直在对某些文件进行排队以进行合并，即使没有发生任何更改。在“待更改”窗口中，更改列仅显示合并，而不是通常的合并、编辑或合并、分支强>。
没有人接触这些文件，但它们不断重新出现在待处理的更改合并队列中。
我以前见过这种情况发生在一个已删除的文件夹中，但在分支之间的合并中不断重新出现。在这种情况下，我在该文件夹路径的所有分支中使用了 tf destroy ，它解决了问题。然而，在这种环境中，它包含团队想要保留的文件。
有其他人经历过和/或解决过这个问题吗？
For some unknown reason, TFS seems to keep queuing certain files for merges, even though there are no changes. In the Pending Changes windows, the Change column only states Merge, and not the usual Merge, edit or Merge, branch.
Nobody touches these files and yet they keep reappearing under the pending changes merge queue.
I've seen this happen before with a folder that was deleted, but kept reappearing in the merges between branches. In that case, I used tf destroy in all branches for that folder's path and it solved the problem. However, in this environment, it's with files that the team wants to keep.
Has anyone else experienced and/or resolved this issue?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
尝试 TFS 2010 SP1 和 CU1。它修复了一些合并错误。就像下面这样：
Try TFS 2010 SP1 and CU1. It fixed some merge bugs. Like the following:
如果您安装了Team Foundation Power Tools，您可以使用< code>tfpt uu 撤消对任何未更改文件的更改（是的，当文件被标记为已更改并且您得到告诉他们是相同的！）。
If you have the Team Foundation Power Tools installed you can use
tfpt uuto undo changes to any unchanged files (yes, it's well annoying when files are flagged as changed and you get told they are identical!).