Make sure we always get the latest from git

ignore merge conflicts, throw away old stuff etc.  So that we cope with
git push --force changing history.