git 使用常见错误解决

一、github中git push origin master出错：error: failed to push some refs to

详细错误信息
! [rejected] master -> master (non-fast-forward)error:failed to push some refs to'https://github.com/xxxxx/xxxxxx.git'To prevent you from losing history, non-fast-forward updates were rejectedMerge the remote changes (e.g.'git pull') before pushing again. See the'Note about fast-forwards'section of'git push --help'fordetails.

很明显是：

本地没有update到最新版本的项目（git上有README.md文件没下载下来）

本地直接push所以会出错。

解决办法

git pull --rebase origin master

From https://github.com/xxxxx/xxxxxx.git * branch master -> FETCH_HEADFirst, rewinding headtoreplay your workontop of it...Applying:addlocal crifanLibtogithub

可以看到，此时已经把github上最新的文件下载下来了：

再次 git push -u origin master 成功提交