Is there a way to do a git pull that ignores any local file changes without blowing the directory away and having to perform a git clone?
git pull
git clone
For me the following worked:
(1) First fetch all changes:
$ git fetch --all
(2) Then reset the master:
$ git reset --hard origin/master
(3) Pull/update:
$ git pull