How do I force an overwrite of local files on a git pull?
git pull
The scenario is the following:
I summarized other answers. You can execute git pull without errors:
git fetch --all git reset --hard origin/master git reset --hard HEAD git clean -f -d git pull
Warning: This script is very powerful, so you could lose your changes.