解决:GitHub 远程端添加了 README.md 文件后,本地 push 代码时出现错误

一、错误描述

To github.com:compassblog/PythonExercise.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'git@github.com:compassblog/PythonExercise.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.

如图所示:

二、错误原因

GitHub 远程端添加了 README.md 文件后,无法再次 push 的主要原因是 GitHub 中的 README.md 文件不在本地代码目录中。

如下图所示:GitHub 远程端有 README.md 文件,而本地没有这个文件

三、解决方法

执行下面命令进行代码合并:

git pull --rebase origin master

如图所示:

执行上面代码后可以看到本地代码库中已经合并了 README.md 文件

这时候再执行下面命令即可完成代码上传到 GitHub

git push -u origin master

如图所示:

扫描二维码关注微信公众号,了解更多

--------------------------------------------

posted @ 2018-04-19 16:54  compassblog  阅读(...)  评论(...编辑  收藏