Git push报错Updates were rejected because the remote contains work that you do not have locally.

提交代码时执行git push origin master后，报错：

于是执行了一下：git push origin master -f，仍然报错

网上找了一下，再次执行 git pull origin master，报错 Automatic merge failed; fix conflicts and then commit the result.

之后再执行git pull，提示Pull is not possible because you have unmerged files.
最后执行git add -u
git commit -m “fix some bug”
git pull
git push origin master
就可以了

总结：整个过程十分懵逼，不知其然也不知其所以然，需要加强git的学习。本文仅记录一下