hotfix/feature merge: push on successful merge

We've historically done this by hand, but forgetting to push one or
both branches has been a source of frustration and confusion.

Automate all the things!

Git allows pushing as many branches as you want:
git push {remote_name} {branch1} {branch2} ...