A four month branch divergence with major work on both sides. A full day of cherry-picking to fix it.
I now have several new git aliases which are as sophisticated as they are cursed (e.g. git pick-next OTHER_BRANCH) that I hope to never use again.
My ~/.gitalias file is not a place of honor.