How do I force an overwrite of local files on a git pull?
git pull
The scenario is the following:
I had the same problem. No one gave me this solution, but it worked for me.
I solved it by:
.git
git reset --hard HEAD
git push
Now it works.