Pull de força git
git fetch --all
git reset --hard origin/master
Pleasant Panther
git fetch --all
git reset --hard origin/master# Newer default
git fetch --all
git reset --hard origin/maingit reset --hard origin/master
The only thing that worked for me was:
git reset --hard HEAD~5
This will take you back five commits and then with
git pull
I found that by looking up how to undo a Git merge.