TFS:用另一个覆盖一个分支

本文介绍了TFS:用另一个覆盖一个分支的处理方法，对大家解决问题具有一定的参考价值，需要的朋友们下面随着小编来一起学习吧！

问题描述

限时送ChatGPT账号..

是否可以用另一个分支覆盖一个分支?

Is it possible overwrite a branch with another?

或者是删除分支B并从分支A创建新分支的唯一解决方案?

Or is the only solution to delete branch B and make a new branch from Branch A?

推荐答案

除非您运行的是 TFS 2010，否则我建议您使用 Merge + Resolve 使两个分支恢复同步.

Unless you're running TFS 2010, I'd recommend using Merge + Resolve to bring the two branches back in sync.

# cancel out of conflict dialog
tf merge A B -r -force -version:T
tf resolve B -r -auto:acceptTheirs

这应该使所有内容都相等，除了仅在 B 中创建且从未合并回来的文件.使用 Folder Diff 查找 &调和它们.

That should equalize everything, except for files that were only created in B and never merged back. Use Folder Diff to find & reconcile them.

在 2005/2008 中删除 + 重新分支会在未来冒着噩梦般的调试命名空间冲突的风险.如果你有 2008，另一个选择是销毁 + 重新分支.显然，这假设您可以从 B 的原始副本中丢失所有历史记录.

Delete + rebranch in 2005/2008 runs the risk of nightmarish-to-debug namespace conflicts in the future. The other option, if you have 2008, is to Destroy + rebranch. Obviously that assumes you are ok with losing all the history from the original copy of B.

这篇关于TFS:用另一个覆盖一个分支的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！