版权声明:欢迎转载,有问题劳烦指出 https://blog.csdn.net/qq_33592002/article/details/81979183
参考 博文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即可