WTFname的博客

原创 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...