git fetch --all
git reset --hard origin/branch
git fetch downloads the latest from remote without trying to merge or rebase anything. Then git reset resets the master branch to what you just fetched
This FORCES an overwrite of local files, NO merging.