Fixing a force push on master

Question

I mistankely force pushed an outdated version of master branch I had on local to remote and reverted a bunch of commits.

To try to fix this, I cherry-picked all of the commits merged after the commit I reverted to and merged them into the master branch through a new pull request.

Will doing this fix my mistake? The code is now the same as before but the commits have different sha's.

Answer 1

and reverted a bunch of commits.

You didn't revert the commits, you pointed master to a different spot. The difference is subtle but important to understand.

Cherry-picking the commits back onto the branch is one way to go back to the desired code and it will produce the correct result if you don't miss any commits. The history may be different (different SHAs) but the code will be the same (which is what really matters in most cases).

(Different SHAs may be a problem [a nuisance] if you work with other people because the history has changed).