git push 出现报错error: failed to push some refs to

今天向git提交代码的时候出现了报错

 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to '巴拉巴拉巴拉'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first 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 pull

• 然后找到冲突的文件进行保留
• 解决完成后冲突在push上去

然后还有一个比较刚的方法：
git push -u origin master -f
另外这个命令比较危险，他的意思是将本地代码强制推送带远程，那么就会覆盖远程当前代码。慎用！！