[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-devel] Re: 3-way merge considered harmful

From: Timothy Brownawell
Subject: [Monotone-devel] Re: 3-way merge considered harmful
Date: Sun, 1 May 2005 15:43:58 -0500

On 5/1/05, Nathaniel Smith <address@hidden> wrote:
> Here's another pathological case for 3-way merge:
>    A
>    |
>    B
>   / \
>  C   D
> [...]
> So, clearly, picking A as an ancestor in the above graph is terrible.
> This leaves us in a bad situation, though.  The possibility of
> criss-cross merge means that we are sometimes (or often) forced to
> choose ancestors that are far away, ...

Maybe there's a way to not have to choose distant ancestors after
criss-cross? I'm wondering what happens if you merge using *each* of
the least common ancestors, and then treat any differences in the
result as conflicts...


reply via email to

[Prev in Thread] Current Thread [Next in Thread]