Octopus and ours strategies

An octopus merge joins more than two heads in one merge commit when no conflicts arise.

Strategy -s ours records a merge but keeps our tree — useful for voiding a side branch's content.

ours/theirs during conflicts depend on merge vs rebase direction — verify which side is which.

Octopus refuses conflicting merges; fall back to pairwise merges when needed.

These are specialized tools — prefer ordinary merges unless you have a clear graph reason.

git merge -s ours obsolete-topic