当源代码管理资源管理器同时显示变更集的分支和合并时，这意味着什么? [英] What does it mean when Source Control Explorer shows both branch and merge for a changeset?

问题描述

我试图了解驻留在 TFS 2005 中的代码库的历史记录，但我遇到了一个变更集，其中所有变更都被标记为分支和合并.

I am trying to understand the history of my codebase, which resides in TFS 2005, and I encountered a changeset where all changes were marked as both branch and merge.

Name    Change           Folder
------------------------------------------------
A.cs    merge, branch    $/Root/Solution/Project  

我找不到任何内容(尤其是在 MSDN 上)描述添加、编辑、删除、分支、合并、取消删除、编码等的各种组合的含义.每个单独使用时都非常容易解释，有些像添加和删除一样没有意义，所以我正在寻找有关合法组合及其含义的信息.

I am unable to find anything (especially on MSDN) describing what the various combinations of Add, Edit, Delete, Branch, Merge, Undelete, Encoding, etc mean. Each is pretty self explanatory when used alone and some do not make sense together like Add and Delete so I am looking for information on the legal combinations and what they mean.

推荐答案

Merge 可以与除 Add 之外的任何内容组合.就其本身而言，合并只是意味着 (1) 无论发生什么都是在您签入时调用合并命令的结果 (2)，除了更改本身之外，TFS 还将记录适当的合并历史元数据.更改类型列表中的其余操作会准确地告诉您正在对目标项应用哪种更改.因此:

Merge can be combined with anything except Add. On its own, Merge just means that (1) whatever happened is the result of invoking the Merge command (2) when you checkin, TFS will record the appropriate merge history metadata in addition to the changes themselves. The remaining operation(s) in the list of changetypes tells you exactly what kind of change is being applied to the target item. Thus:

合并，分支 = 源分支中存在但目标分支中没有的项目第一次被复制到目标

Merge, Branch = an item that exists in the source branch but not the target branch is being copied over to the target for the first time

这篇关于当源代码管理资源管理器同时显示变更集的分支和合并时，这意味着什么?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！