update_from_master: Use git push -f to override errors about non-fast-forward commits.