Reset the Remote Repo to match your local repo after a bad merge
by Joseph on the 15th Apr 2015
If you have merged in code from a Fork and wanted to undo the merge. Please follow the following steps.
- Reset your local repo ( this will rollback the head by 2 commits)
git reset --hard HEAD~1
- Force push the change so the remote repo matches your local
git push -f
Now your remote repo and local repo should match.