使用git进行更新报错Git Pull Failed: refusing to merge unrelated histories
或者提交报错Push rejected: Push to origin/master was rejected
原因是git拒绝合并两个不相干的内容
解决办法:
$ git pull origin master --allow-unrelated-histories
出现如下信息说明成功
From https://gitee.com/mywangyi/zbook-parent
* branch master -> FETCH_HEAD
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.