My github has 100 commits in it right now. I need to rollback the repository to commit 80, and remove all the subsequent ones.
This repo is supposed to be for merging from miscellaneous users. A bunch of merges went in as commits from me, due to excessive editing. That was due to a mislabeling of my remote branches, where 3 developers were labeled as each other. I need to reset to that point, and then pull forwards.
I wanted to rebase, as in this example: How can I remove a commit on github?
However, git wants me to do a lot of conflict management. Is there a simpler way?
git reset --hard <old-commit-id> git push -f <remote-name> <branch-name>
Note: As written in comments below, Using this is dangerous in a collaborative environment: you're rewriting history