很久没提交代码了，使用Git上传本地文件到github时，出现报错

git add .
git commit -m"拖拽"
git push origin cjp

当执行到push时，就会报错，报错代码如下：

$ git push origin cjp
To http://xxx.git
 ! [rejected]        cjp -> cjp (fetch first)
error: failed to push some refs to 'http://xxx.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文件不在本地代码目录中，可以通过如下命令进行代码合并

git pull --rebase origin cjp

 然后

git push origin master

便可上传成功！