fatal: refusing to merge unrelated histories

Git 的报错
一、fatal: refusing to merge unrelated histories
新建了一个仓库之后,把本地仓库进行关联提交、拉取的时候,出现了如下错误:

1
2
fatal: 'master' does not appear to be a git repository
fatal: Could not read from remote repository.

二、解决方案
在你操作命令后面加 –allow-unrelated-histories
例如:

1
2
3
4
5
git merge master --allow-unrelated-histories
$ git pull --allow-unrelated-histories
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitignore
Automatic merge failed; fix conflicts and then commit the result.

我这里由于使用了官方的 .gitignore 自动合并失败,需要手动合并之后再进行 add、commit 即可

如果你是git pull或者git push报fatal: refusing to merge unrelated histories
同理:

1
git pull origin master --allow-unrelated-histories / git pull --allow-unrelated-histories