If you don't need your local changes and want to overwrite them with the remote version, this worked for me
git reset --hard git pull