Cheatsheet Ignore local changes, delete new files and pull from remote (my favourite) git reset --hard git clean -fxd git pull