Should we be clear that we need to merge (rebase?) all authoritative branches (master, staging, [other?]) in this step?