In this section: > I think in the context of the merge commit ours/theirs discus...

mc10 on Nov 2, 2023 | parent | context | favorite | on: Confusing Git Terminology

In this section:

> 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?

jvns on Nov 2, 2023 [–]

fixed, thanks!