Question

We have branches origin and develop.
The initial state of master was tagged at tag_ABC.

We have few changes made to the develop branch and pushed to origin.
Then we have accidentally merged develop into master and pushed to origin.

Now we would like to revert master to the checkpoint tag_ABC. How can we do that?

Answer 1

You can do

git checkout master
git reset --hard tag_ABC
git push --force origin master

Please note that this will overwrite existing history in the upstream repo and may cause problems for other developers who have this repo checked out.

As per Luke Wenke’s comment, other developers who have got master checked out will have to do the following:

git pull
git reset --hard origin/master