How do I force an overwrite of local files on a git pull?
git pull
The scenario is the following:
I had a similar problem. I had to do this:
git reset --hard HEAD git clean -f git pull