【problema】
git pull falhou, prompt fatal: recusando-se a mesclar históricos não relacionados
Administrator@SJMZ MINGW64 ~/learngit (master)
$ git pull origin master
From https://gitee.com/sjmz30071360/learnGit
* branch master -> FETCH_HEAD
* [new branch] master -> origin/master
fatal: refusing to merge unrelated histories
Este problema é devido a dois repositórios git irrelevantes, um repositório local e um repositório gitee remoto. A extremidade remota sente que este repositório local é irrelevante para si mesmo, então ele informa que não pode ser mesclado.
【Solução】
使用 git pull origin master --allow-unrelated-histories
Administrator@SJMZ MINGW64 ~/learngit (master)
$ git pull origin master --allow-unrelated-histories
From https://gitee.com/sjmz30071360/learnGit
* branch master -> FETCH_HEAD
Already up to date!
Merge made by the 'recursive' strategy.
Administrator@SJMZ MINGW64 ~/learngit (master)
$ git push origin master
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 2 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 369 bytes | 46.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0)
remote: Powered By Gitee.com
To https://gitee.com/sjmz30071360/learnGit.git
36cf998..7d374b0 master -> master
Administrator@SJMZ MINGW64 ~/learngit (master)
$