前段时间在Visual Studio 2008 TFS中将近期干线更改合并到干线的一个分支(Merge recent trunk changes to a branch of trunk from a

前段时间在Visual Studio 2008 TFS中将近期干线更改合并到干线的一个分支(Merge recent trunk changes to a branch of trunk from a while ago in Visual Studio 2008 TFS)

我一直打砖墙试图将变化合并到一个分支。

大约一个月前，树干（5.0）分叉（至6.0）。 从那以后，开发已经在6.0分支上完成了，但是对主干也进行了热修复。 我现在想更新6.0.x分支，因为6.0分支是在大约一个月前从5.0分支形成的，所以对主干进行了所有更改。

有没有办法做到这一点，而不检查干线（5.0.x）和分支（6.0.x），并使用第三方工具来协调差异？

I keep hitting brick walls trying to merge changes to the trunk with a branch.

A month or so ago, the trunk (5.0) was branched off (to 6.0). Since then, development has been done on the 6.0 branch, but hot-fixes have also been made to the trunk. I now want to update the 6.0.x branch with all the changes that have been made to the trunk since the 6.0 branch was formed off the 5.0 trunk a month or so ago.

Is there any way to do this without checking out both trunk (5.0.x) and branch (6.0.x) and using a 3rd party tool to reconcile differences?

最满意答案

您可以使用Source Control Explorer轻松完成此操作。 这在http://msdn.microsoft.com/en-us/library/ms181282(v=VS.90).aspx中介绍，向下滚动到合并版本控制项目部分。

在源代码管理资源管理器中，右键单击5.0 Trunk文件夹，然后选择合并。 在源代码管理合并向导中，在源代码分支文本框中，将出现5.0 Trunk文件夹的路径和名称。

在目标分支下拉列表中，选择6.0分支文件夹。

在选择要合并的源分支更改中，选择所有更改为特定版本，然后单击下一步。

在“选择源项目的版本”步骤中，在“版本类型”下拉列表中选择“最新版本”，然后单击“下一步”。

在执行合并操作步骤中，单击完成。

由于源分支和目标分支之间存在差异，因此会出现“解决冲突”对话框。 按照下一过程中的步骤解决冲突。 如果没有冲突，则不会出现“解决版本冲突”对话框。

You can easily do this using the Source Control Explorer. This is described in http://msdn.microsoft.com/en-us/library/ms181282(v=VS.90).aspx, scroll down to the section Merging Version Control Items.

In Source Control Explorer, right-click the 5.0 Trunk folder, and select Merge. In the Source Control Merge Wizard, in the Source Branch text box, the path and name for the 5.0 Trunk folder appears.

In the Target Branch drop-down list, select the 6.0 Branch folder.

In Select the source branch changes you want to merge, select All changes up to a specific version, and click Next.

In the Select the version of the source items step, in the Version Type drop-down list, select Latest Version, and click Next.

In the Perform the merge operation step, click Finish.

Since there are differences between the source and target branches, the Resolve Conflicts dialog box appears. Follow the steps in the next procedure to resolve the conflicts. If there are no conflicts, the Resolve Version Conflict dialog box will not appear.