How do I force an overwrite of local files on a git pull?
git pull
The scenario is the following:
The only thing that worked for me was:
git reset --hard HEAD~5
This will take you back five commits and then with
I found that by looking up how to undo a Git merge.