How to force Git to overwrite local files on pull?
git fetch --all git reset --hard
More info
here
.