git提交到远程藏库冲突解决

问题

在修改好文件，然后用命令$ git push 向github上的远程仓库推送时，出现下列错误：

---

error: failed to push some refs to 'https://github.com/GDDXZ/RobotDenso.git'
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.

---

原因

两人同时fetch了一个分支。 第一个人修改后提交，第二个人提交就失败。

解决方法

1.强制推送

$ git push -f
可以提交，会将remote上第一个人的改动冲掉，比较暴力，不太好。

2.正常解决

先 git fetch origin 然后git merge origin/master, 和本地分支合并, 之后再push。