Force Git to overwrite local files on pull (keeping untracked files intact)
git fetch --all git reset --hard origin/master