![Unrelated Unrelated](/uploads/1/2/5/5/125500665/951538918.png)
Git merge master -allow-unrelated-histories /SpringSpace/newframe on druid ⌚ 11: 36: 49 $ git merge master -allow-unrelated-histories Auto-merging.gitignore CONFLICT (add / add): Merge conflict in.gitignore Automatic merge failed; fix conflicts and then commit the result. 如果你是git pull或者git push报fatal: refusing to merge unrelated histories. Git – Trying to pull files from my Github repository: 'refusing to merge unrelated histories' – Stack Overflow. Git无法pull仓库refusing to merge unrelated histories – lindexigd的专栏 – 博客频道 – CSDN.NET.
The default behavior has changed since Git 2.9:'git merge' used to allow merging two branches that have no commonbase by default, which led to a brand new history of an existingproject created and then get pulled by an unsuspecting maintainer,which allowed an unnecessary parallel history merged into theexisting project. The command has been taught not to allow this bydefault, with an escape hatch -allow-unrelated-histories optionto be used in a rare event that merges histories of two projectsthat started their lives independently.See the for more information.You can use -allow-unrelated-histories to force the merge to happen.