如何解决failed to push some refs to git

报错

$ git push -u origin master

To [e-mail]:yangchao0718/cocos2d.git

! [rejected] master -> master (non-fast-forward)

error: failed to push some refs to ‘[e-mail]:yangchao0718/cocos2d.git

hint: Updates were rejected because the tip of your current branch is behin

hint: its remote counterpart. Integrate the remote changes (e.g.

hint: ‘git pull …’) before pushing again.

hint: See the ‘Note about fast-forwards’ in ‘git push –help’ for details.

问题

如何解决failed to push some refs to git
工具/原料
git
方法/步骤

1

此时很多人会尝试下面的命令把当前分支代码上传到master分支上。
$ git push -u origin master
但依然没能解决问题

2

出现错误的主要原因是github中的README.md文件不在本地代码目录中
可以通过如下命令进行代码合并【注：pull=fetch+merge]
git pull –rebase origin master
执行上面代码后可以看到本地代码库中多了README.md文件

3

此时再执行语句 git push -u origin master即可完成代码上传到github

参考 ：
百度百科

CSDN CODE创建项目