Reset the Remote Repo to match your local repo after a bad merge

If you have merged in code from a Fork and wanted to undo the merge. Please follow the following steps.

  1. Reset your local repo ( this will rollback the head by 2 commits)
    git reset --hard HEAD~1
  2. Force push the change so the remote repo matches your local
    git push -f

    Now your remote repo and local repo should match.