Comment by serpi

you just rebase on top of their changes. No biggie here. It does not matter one bit if their branch rewrites itself underneath.