创建“diverged”分支来显示你的问题真的很简单。错误消息取决于你的特定Git版本，也可能取决于本地配置。

$ git init
Initialized empty Git repository in ...
$ git config --unset pull.rebase
$ git config --unset pull.ff
$ cat > todos <<EOF
> my list
> EOF
$ git add todos
$ git commit -m 'initial todos'
[master (root-commit) e729989] initial todos
 1 file changed, 1 insertion(+)
 create mode 100644 todos
$ git checkout -b original
Switched to a new branch 'original'
$ cat >> todos <<EOF
> 
> milk
> EOF
$ git add todos
$ git commit -m 'buy milk'
[original 8b36329] buy milk
 1 file changed, 2 insertions(+)
$ git checkout -b other
Switched to a new branch 'other'
$ sed -i 's/^milk$/eggs/' todos
$ git add todos
$ git commit --amend -m 'buy eggs' # this diverges the branches. there are other possibilities, including rebase and reset
[other a318636] buy eggs
 Date: Thu Dec 21 12:00:35 2023 +0100
 1 file changed, 2 insertions(+)
$ git checkout original
Switched to branch 'original'
$ git pull . other
From .
 * branch            other      -> FETCH_HEAD
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint: 
hint:   git config pull.rebase false  # merge
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
$ git pull --ff-only . other
From .
 * branch            other      -> FETCH_HEAD
hint: Diverging branches can't be fast-forwarded, you need to either:
hint: 
hint:   git merge --no-ff
hint: 
hint: or:
hint: 
hint:   git rebase
hint: 
hint: Disable this message with "git config advice.diverging false"
fatal: Not possible to fast-forward, aborting.
$

字符串