关于git merge 冲突问题

最新推荐文章于 2025-06-20 09:35:34 发布

原创最新推荐文章于 2025-06-20 09:35:34 发布 · 1.8k 阅读

0 ·

CC 4.0 BY-SA版权

文章标签：

#git #merge

Git 专栏收录该内容

6 篇文章

订阅专栏

本文解释了在使用Git进行合并操作时遇到的fatal: refusing to merge unrelated histories错误，并提供了解决方案：通过使用git merge --allow-unrelated-histories origin/master命令来强制合并两个没有共同基点的分支历史。此问题源于Git默认不允许合并完全独立的项目历史，以避免不必要的平行历史被合并到现有项目中。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

git错误提示如下

fatal: refusing to merge unrelated histories

解决办法

git merge --allow-unrelated-histories origin/master

原理解释

“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.