[BigTTYGothGF]

> Either the code can be merged or it can't.

Not an intuitionist, I see.

[pdpi]

If you are an intuitionist, excluded middle isn't an axiom, but is still provable/assertable on a case-by-case basis. This is a scenario where asserting it is entirely reasonable.

[kps]

The whole point of a VCS is that your code exists in a superposition of merged and unmerged.