解决git push 报non-fast-forward updates were rejected错，成功上传project

用git push origin master 上传失败，报无法和并的错误

error: failed to push some refs to 'git@github.com:xchong/learngit.git'

To prevent you from losing history, non-fast-forward updates were rejected

Merge the remote changes (e.g. 'git pull') before pushing again.

看提示知道可以用git pull 来处理问题，于是便用git pull --help 看了一下，想了下原因，因该是远程端的仓库和本地仓库的master分支的更新程度不一样，如图



我们需要用git pull git@github.com:xchong/count_number_sort(换成你的路径).git  把远程端的master拉到本地mater中。如图：



然后再git merge master，分支更新程度就一样了，再git push .....就可以上传到远程仓库中了