参考 博文fatal: refusing to merge unrelated histories
添加git pull origin master --allow-unrelated-histories 命令
On branch master
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
按照提示 再次commit即可
本文介绍了一种在Git中合并存在不相关历史的分支时遇到的错误'fatal: refusing to merge unrelated histories'的解决方案。通过使用命令'git pull origin master --allow-unrelated-histories',可以允许合并不相关的历史记录。当所有冲突被解决后,需要再次执行'git commit'以完成合并。
参考 博文fatal: refusing to merge unrelated histories
添加git pull origin master --allow-unrelated-histories 命令
On branch master
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
按照提示 再次commit即可

被折叠的 条评论
为什么被折叠?