refusing to merge unrelated histories的强制合并

最新推荐文章于 2025-07-24 14:23:29 发布

原创最新推荐文章于 2025-07-24 14:23:29 发布 · 270 阅读

0 ·

CC 4.0 BY-SA版权

文章标签：

#git #merge #pull #unrelated histories

git 专栏收录该内容

2 篇文章

订阅专栏

本文详细解析了在使用Git进行分支合并时遇到的fatal: refusing to merge unrelated histories错误，并提供了解决方案，即通过添加--allow-unrelated-histories参数来强制执行合并操作，帮助读者有效处理独立项目历史的合并问题。

问题描述

git合并分支时，出现错误:

fatal: refusing to merge unrelated histories

解决办法

在相关命令后加上参数，强制合并：

--allow-unrelated-histories

https://github.com/git/git/blob/master/Documentation/RelNotes/2.9.0.txt#L58-L68

“git merge” used to allow merging two branches that have no common
base by default, which led to a brand new history of an existing
project created and then get pulled by an unsuspecting maintainer,
which allowed an unnecessary parallel history merged into the
existing project. The command has been taught not to allow this by
default, with an escape hatch “–allow-unrelated-histories” option
to be used in a rare event that merges histories of two projects
that started their lives independently.
“git pull” has been taught to pass the “–allow-unrelated-histories”
option to underlying “git merge”.