分支落后于 'GitHub/master' 1 次提交

Question

New to git and having an issue.

Commit ab30d85: "Github/Master" - Test
Commit d4f6492: "Master" - Fixed error

I need to delete and remove the ab30d85 commit and make the d4f6492 the master for github. When I try to revert the test commit I get the error below. Please help.

On branch master Your branch is behind 'GitHub/master' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) nothing to commit, working tree clean

Answer 1

Make sure you've deleted the commit on your local, and force push to the master branch to update it as per your local branch using

git checkout master; git push -f

That being said, please know that the master branch on github will be force updated with your local branch. This is not a recommended practice.

Answer 2

You have options:

git rebase origin/master will rework you local branch to include the ab30 commit and the apply you d4f commit. You will need to force push after fixing any merge conflicts to get this onto the remote branch.

git push --force will replace the remote branch with your local copy. Not good practice in general