Elijah Newren <newren@xxxxxxxxx> writes: > Cool, thanks for the context. I'm happy to go down this path, but > there is one question I'd like your opinion on: what if the > intermediate content merges have conflicts themselves? If that > question isn't clear, let me be more precise... I think you answered this yourself after (re)discovering the virtual ancestor merge in the recursive strategy, and no longer need my input here ;-)
