当源代码管理资源管理器显示变更集的分支和合并时，这意味着什么？
我试图了解驻留在 TFS 2005 中的代码库的历史记录，并且遇到了一个变更集，其中所有更改都被标记为分支和合并。
Name Change Folder
------------------------------------------------
A.cs merge, branch $/Root/Solution/Project
我无法找到任何内容（尤其是在 MSDN 上）来描述添加、编辑、删除、分支、合并、取消删除、编码等各种组合的含义。每个单独使用时都非常不言自明，有些组合在一起没有意义，例如“添加”和“删除”，因此我正在寻找有关合法组合及其含义的信息。
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
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.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
合并可以与除添加之外的任何内容组合。就其本身而言，合并仅意味着 (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
如果文件是在分支操作期间创建的，并且源分支中的更改随后合并到新分支中而无需在任何时候签入，则这可能是有意义的。
This might make sense if the file were created during a branch operation and changes from the source branch were then merged into the new branch without having checked in at any point.