将 GitHub PR 恢复为特定提交

Question

I've created a new GitHub PR for branch new-feature , it has 10 commits.

I want to revert it to be at the 5th commit.

What is the proper workflow?

Notes:

If I'm on new-feature and use git reset --hard <sha-of-my-5th-commit> , this will just move my local state back. I'm not sure how to affect github's history with this

Answer 1

Please be careful with hard resets and push force. You should back up stuff before resetting. But,

After git reset --hard <sha-of-my-5th-commit> you can run

git push -f

to overwrite the remote branch.

Answer 2

If you want to actually record the history after a reset with a differentiating commit or if force push is disabled, use the following commands:

After git reset --hard <sha-of-my-5th-commit> :

  git reset --soft FETCH_HEAD
  git commit -m "describe the changes you reset"
  git push