场景还原
将本地已有项目推送到 GitHub 远程仓库 远程仓库中有Readme文件 本地仓库同样包含Readme文件
操作步骤
# 1.从远程仓库拉取代码
git pull origin master
# 报错
# Can't Update
# No tracked branch configured for branch master or the branch doesn't exist.
# To make your branch track a remote branch call, for example,
# git branch --set-upstream-to=origin/master master
# 2.执行 git branch --set-upstream-to=origin/master master 依旧不行
git branch --set-upstream-to=origin/master master
# 2.尝试 push 代码
git push origin master
# 报错
# Error merging: refusing to merge unrelated histories
# Push rejected
# Push was rejected, and update failed with error.
# 4. 查询资料, 拉取成功
git pull --allow-unrelated-histories
解决方法总结
强行合并
git pull --allow-unrelated-histories
