git push时报错

在git分支上，由于手贱，执行了一次git reset HEAD^操作，然后重新git add file, commit -m “test” ,git pull ，之后git push origin branchName 时报错

error: failed to push some refs to 
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.

报错原因是”Non-fast-forward”,查了一下这个报错是因为git仓库中已经有了一部分代码，所以它不允许直接把代码覆盖上去。
解决方法：

git push -f