关于git merge 冲突问题

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.