refusing to merge 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”.