gitpull出错：error: failed to push some refs to/git pull origin master --allow-unrelated-histories

今天上传远程仓库时出错

$ git push origin master
To gitee.com:likepnd/recommendation_platform.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'git@gitee.com:likepnd/recommendation_platform.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

参照网上的方法：

1、先把远程仓库拉下来，会自动合并的（不用操心）

git pull origin master

2、再上传

git push -u origin master

pull时出错：
$ git pull origin master
warning: no common commits
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (4/4), done.
From gitee.com:likepnd/recommendation_platform

• branch master -> FETCH_HEAD
• [new branch] master -> origin/master
  fatal: refusing to merge unrelated histories

找到方法：
git pull origin master --allow-unrelated-histories

后面加上 --allow-unrelated-histories ， 把两段不相干的 分支进行强行合并

后面再push就可以了 git push origin master