git 使用问题汇总

问题 1：git push  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.

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

原因：出现错误的主要原因是github中远程仓库的README.md文件不在本地代码目录中，可以通过如下命令进行代码合并【注：pull=fetch+merge]  git pull --rebase origin master 。

执行上面代码后可以看到本地代码库中多了README.md文件，此时再执行语句 git push  origin master即可完成代码上传到github。