Reverting a series of pushed merges and commits in Git (without rewriting history)

Question

Context

One of my teammates mistakenly pushed some commits to our main development branch. We\'re a small, collocated team. Our remote repository is hosted on an inter

Answer 1

You have a small co-located team, so communication isn't a problem. Make the commit history look as it should have looked:

git branch -f develop dab4896
git branch newfeature 8c29252
git push -f origin develop newfeature

and have everyone refetch. You're done.

This kind of mistake is one of the reasons to rewrite.