如何仅合并两个变更集 (TFS) [英] how to merge two changesets only (TFS)

问题描述

您看到 162489 和 162990，我该如何合并它们?

You see 162489 and 162990, How can I merge them ?

推荐答案

我猜您只想将这两个特定变更集合并到另一个分支中.

I'm guessing that you want to merge only those two specific changesets into another branch.

您不能一次性合并多个变更集，除非变更集是按顺序排列的.

You cannot merge multiple changesets in one go, unless the changesets are in sequence.

使用 tf 命令行工具，您可以通过用波浪号分隔版本来指定版本范围.

Using the tf command line tool you specify a range of versions by separating the version with a tilde character.

tf merge /recursive /version:C162489~C162990 "$/SourceBranch" "$/TargetBranch"

在这种情况下，还将包括更改 162987 和 162967.

In this case the changes 162987 and 162967 will also be included.

如果您在 Visual Studio 中使用 UI，则合并对话框将阻止您选择多个单独的变更集，除非它们按顺序排列.

If you are using the UI in Visual Studio then the merge dialog will prevent you to select multiple individual changesets unless they are in sequence.

要将两个单独的变更集合并到另一个分支中，您必须分两步完成:
合并 162489 和 162990(从合并最旧的变更集开始，以防两个变更集都包含对相同文件的更改).

To merge two separate changesets into another branch you will have to do it in two steps:
merge 162489 and then 162990 (start with merging the oldest changeset in case both changesets contain changes to the same files).

然后目标分支的工作区将包含两个变更集的更改，现在您可以将合并作为目标分支中的一个变更集检入.

Then your workspace for the target branch will contain the changes for both changesets and now you can check-in the merges as one changeset in the target branch.

这篇关于如何仅合并两个变更集 (TFS)的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！