> I think in the context of the merge commit ours/theirs discussion earlier, HEAD^ is “ours” and HEAD^^ is “theirs”.
Should HEAD^^ be HEAD^2 instead?