Always keep the repository checkout up to date with GitHub

Don't merge with earlier changesets -- the user might have chosen to force-push
over them. If we run git pull, it would attempt to merge the changes,
potentially resulting in a conflicted state.