文件在 TFS 2008 中未正确合并
几个月前我对一个项目进行了分支，今天又将其合并回来。它说它合并了大约 460 个文件，但我在原始项目中没有看到任何更改。我还向分支项目添加了一些新文件，这些文件已合并，但我的其他代码更改没有。知道如何解决这个问题吗？
当我现在尝试合并时，它说这两个文件是相同的，但当我打开彼此相邻的文件时，我可以看到差异。我有太多更改，无法单独浏览每个文件。
提前致谢。
米希尔
I had branched one of my projects few months back and merged it back today. It said it merged around 460 files but I don't see any of my changes in the original project. I also added few new files to the branched project which got merged but my other code changes did not. Any idea how can I fix this?
When I try to merge now, it says both the files are identical but I can see the difference when I open the files next to each other. I have too many changes to go through each file individually.
Thanks in advance.
Mithil
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
下载 TFS Powertools 并运行 tf merge 并执行 /force。当缓存版本不正确时会发生这种情况。
合并命令
示例如下：
c:\MyProject>tf merge /version:C100branch1branch2/recursive/force
Download TFS Powertools and run tf merge and do a /force. This happens when the cached version is incorrect.
Merge Command
An example would be:
c:\MyProject>tf merge /version:C100 branch1 branch2 /recursive /force
由于某种原因，TFS 无法识别我的文件中的差异。我必须手动进入每个文件并将更改复制到原始文件。不是一次非常愉快的经历。
For some reason TFS couldn't recognize the difference in my files. I had to manually go into each file and copy the changes to the original file. Not a very pleasant experience.