How do I force an overwrite of local files on a git pull?
git pull
The scenario is the following:
Instead of merging with git pull, try this:
git fetch --all
followed by:
git reset --hard origin/master.
git reset --hard origin/master