"diverged" 在 git 或 git 流术语中是什么意思？

Question

做的时候git flow feature start MYFEATURE我最近收到消息

$ git flow feature start MYFEATURE
Branches 'develop' and 'origin/develop' have diverged.
And branch 'develop' may be fast-forwarded.

"diverged" 的这种使用是 git 流程特定的东西，还是也用于 git？一个分支是另一个分支的祖先是否仍然足以让他们考虑 "diverged"？我对基于英语的术语 "diverged" 的假设是，两个分支都必须有另一个分支没有的提交。

在试图找出 "diverged" 的意思时，我遇到了 master branch and 'origin/master' have diverged, how to 'undiverge' branches'? , but that didn't involve git flow, and involved two branches that had commits that the other branch didn't have. The term "diverged" confused a high reputation user enough that they left a comment asking for clarification。

Answer 1

gitflow repo has a function 解释了 "branches have diverged":

的不同情况

# git_compare_branches()
#
# Tests whether branches and their "origin" counterparts have diverged and need
# merging first. It returns error codes to provide more detail, like so:
#
# 0    Branch heads point to the same commit
# 1    First given branch needs fast-forwarding
# 2    Second given branch needs fast-forwarding
# 3    Branch needs a real merge
# 4    There is no merge base, i.e. the branches have no common ancestors

另见我之前的回答about diverged branches。

"diverged" 在 git 或 git 流术语中是什么意思？

What does "diverged" mean in git or git flow terminology?

git

terminology

git-flow