git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFC PATCH] Zooko's merge testcase

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 15, 2009, 03:36 UTC
Message-ID
<alpine.DEB.1.00.0901150432530.3586@pacific.mpi-cbg.de>
In-Reply-To
<1231980818-24812-1-git-send-email-vmiklos@frugalware.org>
Hi,
On Thu, 15 Jan 2009, Miklos Vajna wrote:
> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
> ---

I think the idea can be simplified. Given lines A, B, C in the base commit, one branch _prepending_ the same triplet, and the other branch changing the B to a D.

Only this time, nobody has a chance, even Darcs, because from the diff, you would not know if it was prepended or appended.

(Which happens to be the same problem as 3-way merge has with the example you were implementing; only when looking at the detailed history becomes it clear what was done.)

This all just proves again that there can be no perfect merge strategy; you'll always have to verify that the right thing was done.

Ciao, Dscho

Previous: Miklos Vajna
Message 2 of 2 in “Zooko's merge testcase”
  1. Zooko's merge testcaseMiklos Vajna, Jan 15, 2009
  2. Johannes SchindelinJan 15, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.