It isn't avoidable if we are going to rebase onto master.

One thing that _would_ be good would be to add a check to see if we have diverged from origin/$branch and exit with an error message if that is the case.

That, in combination with `successfully` and `set -e` would make me feel pretty safe about force pushing.