star or parallele merge

[Martin Pool]

On 05/10/05, David Allouche <david at allouche.net> wrote:

> I'm not sure what you mean by "linewise merge" if you mean just plain
> "simple weave merge", it has at least one documented silent failure mode
> that make it unacceptable for me.
>
> http://revctrl.org/CrissCrossMerge

In the example given there it's possible to detect two insertions at a
single point and treat them as a conflict.

> The bottom line is that, in my understanding, merging is largely an
> unsolved problem with nasty yet relatively common edge cases, so good
> diagnostic facilities are required.

Agreed.

--
Martin