Doing a hard reset to a particular commit moves your local branch pointer to point at that commit, and then sets your local working copy to match the repository at that commit.
When you next run git push
, git will attempt to tell the remote server to move its branch pointer to point at the same commit - but the server will probably refuse, saying that this is not a "fast-forward". That's because moving that branch pointer on a shared repository can be dangerous - it may make the old history inaccessible, and other people may have different changes based on the old history.
To tell the remote repository that you're OK with those risks, run git push --force-with-lease
(older instructions will say to use git push --force
; the "with lease" essentially checks for somebody else pushing at the same time as you).
与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…