在TFS中，如何将一个分支合并到不是直接分支的主干上？
在 TFS 中，我注意到您只能将分支合并到显然创建分支的文件夹中。
我有以下文件夹：主干、标签和分支。
当我发布版本时，我会获取最新版本的主干并将其分支到 Tags 文件夹中，例如 Project_01Aug2011。当该版本需要错误修复时，我将从该标签创建一个分支，将其命名为 Project_01Aug2011_BugFishings 并将其放入分支文件夹中。
问题是现在我已经在分支中进行了一些修复，现在这些更改需要与主干本身合并，但这似乎不可能。
TFS 只允许合并到直接发生分支的位置。
使用 TFS 时如何将分支更改合并回主干？ （在 Subversion 中，这非常简单，我可以做到。）
谢谢，
In TFS, I have noticed that you can only merge up your branch to a folder from which the branch was created apparently.
I have the following folders: Trunk, Tags and Branches.
When I have a release, I get the latest version of the trunk and branch it into the Tags folder, e.g. Project_01Aug2011. and when that release needs bug fixing, I'll create a branch from that tag, name it Project_01Aug2011_BugFixings and put it in the branches folder.
The problem is that now I've made some fixes in the branch and now those changes need to be merged up with the trunk itself but this doesn't seem to be possible.
TFS only allows merging up to a location where the branch had happened directly.
How could I merge my branch changes back into the trunk when using TFS? (in Subversion, it was quite simple and I could do so.)
Thanks,
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
第一个选项是将分支的更改合并到标签，然后从标签合并到主干。
第二个选项是通过使用 tf.exe 命令行工具执行无基础合并，直接将更改从分支合并到主干。
First option is to merge from the changes from Branch to tags and then from tags to trunk.
Second option is to merge the changes from Branch to trunk directly by performing a baseless merge using tf.exe commandline tool.