当一个git提交有多个父母时，计算的统计数据是什么？ [英] When a git commit has multiple parents, what are the stats calculated against?

问题描述

当提交包含多个父母时，如这一个，我们看到它有 4个新增和 4个删除。我的问题是比较什么？在文件中增加和删除的内容是否与它们在父母中的存在相比？或者如何进行比较？

解决方案

这是一个三方合并：

• 父母共同的祖先（ git merge-base @ ^ 1 @ ^ 2 ， ^ 1 是第一个父项， ^ 2 是HEAD的第二个父级：请参阅 Ancestry Reference 。）


• 第二个父母（ commit c0ce149 ）作为源代码（正在合并到） 第一个父代（ commit 0994e7c ）充当目的地（位于合并发生的分支上）


• 与HEAD（提交4cd713e ）是合并的结果。

（您可以在此查看另一个三向合并示例答案）根据惯例，GitHub将始终显示父母：

$ b $ b
• 第一个父级，即您合并时所在的分支


• 和第二个父级，即您合并分支中的提交。
>

与这两个提交的共同祖先相比，第二个合并到第一个提交时，会带来4个添加和4个删除。 p>

When a commit has multiple parents, like this one, we see that it has 4 additions and 4 deletions. My question is compared to what? Are the additions and deletions compared to the file as it existed in BOTH parents? Or how exactly is it compared?

解决方案

It is a three-way merge between:

• the common ancestor of both parents (git merge-base @^1 @^2, ^1 being the first parent, ^2 being the second parent of HEAD: see "Ancestry Reference".)
• the second parent (commit c0ce149) acting as source (being merge to)
• the first parent (commit 0994e7c) acting as destination (being on the branch where the merge occurs)
• with HEAD (commit 4cd713e) being the result of the merge.

(you can see another example of three-way merge in this answer)

By convention, GitHub will always display the parents as:

• The first parent, which is the branch you were on when you merged,
• and the second parent, which is the commit on the branch that you merged in.

Compared to the common ancestor of those two commits, the second one, when merged into the first one, brings 4 additions and 4 deletions.

这篇关于当一个git提交有多个父母时，计算的统计数据是什么？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！