Git常见错误解决

本地分支与远程分支不一致

error: failed to push some refs to 'xxx(分支名)'

Updates were rejected because the tip of your current branch is behind its remote counterpart. Integrate the remote changes (e.g. 'git pull ...') before pushing again. 

如果能够保证本地分支是最终正确的分支，可以通过强推的方式直接覆盖远程分支。

git push -f origin <本地分支名>