github - git远端代码回滚

Question

git 上在本地回滚了，但是只要一执行git pull 就又回来了

直接git push 又报错。

Answer 1

The easiest way is to create a branch and merge the corrected bugs, and that's it.

Answer 2

1.git revert (recommended)
2.git push -f after git reset (not recommended, does not respect historical records)