git如何解决failed to push some refs to git

git push origin master 出现问题如下：

Administrator@PC-20150110FGWU /K/cocos2d/yc (master)

$ git push -u origin master

To [email protected]:yangchao0718/cocos2d.git

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

error: failed to push some refs to '[email protected]: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.

此时很多人会尝试下面的命令把当前分支代码上传到master分支上。

$ git push -u origin master   问题也没有解决

可以通过如下命令进行代码合并【注：pull=fetch+merge]

git pull --rebase origin master

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

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