First time I tried that because fixing conflicts in merge was too hard. I rebased the wrong way round.

Shared branches is a bit of a faff just due to coordinating.