Error when running tbump on an outdated branch

[dmerejkowsky]

If the branch you are on is not up-to-date when you run tbump you may end up with something like this:

$ git push origin master v1.2.41-alpha-2
...
 * [new tag]         v1.2.41-alpha-2 -> v1.2.41-alpha-2
 ! [rejected]        master -> master (non-fast-forward)

and then you have a problem.

If you run git pull --rebase at this moment, but then the tag will get detached from the history.

Worse, if you have a continuous integration, you may trigger a deployment build with the tag in the wrong place.

A nice way to fix this issue is to push the branch and the tag in two separate commands (pushing the tag last).