您看看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则合并对话框将prevent你选择多个单独的变更，除非它们是按顺序排列。

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).

那么您的工作空间为目标分支将包含变更为变更集，现在就可以办理登机手续的合并在目标分支1变更。

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.