使用 tfpt.exe 回滚 TFS2008 中的合并
我需要回滚 TFS2008 中的合并操作。该分支稍后需要合并。我知道我可以在主干上使用 tfpt.exe 回滚操作来恢复合并修改的文件，但回滚不会修改合并信息，因此将来从分支合并到主干中不会恢复由合并撤消的更改回滚。此外，从主干合并到分支将面临覆盖分支中的更改的风险。
我可能遗漏了相当多的必要信息，因此我将根据需要更新问题。
撤消合并并且仍然能够在以后合并所有更改的最佳方法是什么？
谢谢。
I need to roll back a merge operation in TFS2008. The branch will need to be merged at a later date. I know I can use the tfpt.exe rollback operation on the trunk to restore the files modified by the merge, but rollback doesn't modify the merge information so future merges from the branch into the trunk won't restore the changes undone by the rollback. Also, merges from the trunk into the branch will risk overwriting changes in the branch.
I've probably left out quite a bit of necessary information, so I'll update the question as needed.
What is the best way to undo the merge, and still be able to merge all changes in at a later date?
Thanks.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
我只是尝试手动执行此操作，当您在签出旧版本然后签入旧版本后尝试合并时，该文件本质上仍然标记为已合并。在没有 tfpt 的情况下执行此操作时，我看到了同样的问题 - 非常有趣。
所以我查看了文档，看起来您要做的是使用 /force。我猜如果您执行 tfpt 回滚然后运行 tf merge 它将起作用。如果没有，请尝试手动回滚，然后运行 tf merge /force。
希望有帮助。
I just tried this doing it manually and when you attempt to merge after after having checked out an older version and then checking in the older version the file is still essentially flagged as already merged. I see the same exact problem when doing it without tfpt- pretty interesting.
So I took a look at the docs and it looks like what you are going to want to do is use /force. I am guessing if you do a tfpt rollback and then run tf merge it will work. If not, try manually rolling back and then running tf merge /force.
Hope that helps.