我一直在尝试将对主干的更改与分支合并。
大约一个月前，主干 (5.0) 被分支出来(到 6.0)。从那时起，在 6.0 分支上进行了开发，但也对主干进行了热修复。我现在想更新 6.0.x 分支，其中包含自一个月前 6.0 分支从 5.0 主干上形成以来对主干所做的所有更改。
有没有办法在不检查主干 (5.0.x) 和分支 (6.0.x) 并使用第 3 方工具来协调差异的情况下执行此操作？
最佳答案
您可以使用源代码管理资源管理器轻松完成此操作。这在 http://msdn.microsoft.com/en-us/library/ms181282(v=VS.90).aspx 中有描述。 ，向下滚动到合并版本控制项部分。
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.
关于visual-studio-2008 - 将最近的主干更改合并到 Visual Studio 2008 TFS 中不久前的主干分支，我们在Stack Overflow上找到一个类似的问题： https://stackoverflow.com/questions/8055644/