提交Git文件报错：error: failed to push some refs to 'https://github.com/xxxx'...

简单描述：

运行git push -u origin master命令报错

Fatal: HttpRequestException encountered.
Username for 'https://github.com': xxxx@qq.com
To https://github.com/xxxxxx/vue-webpack-mock-axios-vuex
! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/xxxx/vue-webpack-mock-axios-vuex'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

错误原因：

主要原因是git仓库上已经存在readme文件，故在提交时可能会存在冲突，这时您需要选择的是保留线上的文件或者舍弃线上的文件：

解决办法：

1、如果您舍弃线上的 文 件，则在推送时选择强制推送，强制推送需要执行下面的命令：
git push origin master -f

2、如果您选择保留线上的readme文件,则需要先执行

git pull origin master