Junio C Hamano <gits...@pobox.com> writes: > I do agree that it is sensible to avoid doing any funky thing during > the virtual base merges, whose result is much less observable (hence > harder to form the right mental model in end user's head) than the > outermost merge. Do we want to allow this for inner merges when the > setting is 2? Wouldn't that hit the same BUG()?
Ah, actually no. 2 would make a choice of committing to one possible merge result and does not leave options to be resolved as conflicted, so we should be able to write out its decision as a tree. If we cannot form a tree object when operating with 2, we do have a bug and we do want to know about it.
