共计 567 个字符，预计需要花费 2 分钟才能阅读完成。
使用 git 真的是让我受尽了折磨，不写个集合都觉得对不起自己踩过的那些坑啊
错误一：failed to push some refs to git $ git push -u origin master
To git@github.com:yangchao0718/cocos2d.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to ‘git@github.com: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.
出现错误的主要原因是 github 中的 README.md 文件不在本地代码目录中
可以通过如下命令进行代码合并【注：pull=fetch+merge]
git pull –rebase origin master
执行上面代码后可以看到本地代码库中多了 README.md 文件
此时再执行语句 git push -u origin master 即可完成代码上传到 github
正文完
