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

Re: Merge seems to get confused by (reverted) cherry-picks

From
Johan Herland <johan@herland.net>
Date
Sep 3, 2008, 11:16 UTC
Message-ID
<200809031316.05336.johan@herland.net>
In-Reply-To
<48BE56BD.6050805@gmail.com>
On Wednesday 03 September 2008, Ittay Dror wrote:
> Note: codeville tried to implement a merge algorithm that considers
> the history to decide what the user wants to do:
> http://revctrl.org/PreciseCodevilleMerge. Maybe worth while
> exploring?
You haven't been here long, have you? ;)

There was an infamous mailing list discussion between Bram Cohen (who created PreciseCodevilleMerge), and Linus Torvalds back in 2005, discussing merge strategies. It is well recounted here:

http://wincent.com/a/about/wincent/weblog/archives/2007/07/a_look_back_bra.php

Also, nowadays, even Bram himself seems to have conceded PreciseCodevilleMerge in favour of traditional 3-way merge, at least if you look at item #3 in the following posting from his blog:

http://bramcohen.livejournal.com/52148.html
...Johan
-- 
Johan Herland, <johan@herland.net>
www.herland.net
Previous: Andreas EricssonNext: Mike Hommey
Message 8 of 9 in “Merge seems to get confused by (reverted) cherry-picks”
  1. Björn SteinbrinkSep 3, 2008
  2. Björn SteinbrinkSep 3, 2008
  3. Junio C HamanoSep 3, 2008
  4. Björn SteinbrinkSep 3, 2008
  5. Linus TorvaldsSep 3, 2008
  6. Ittay DrorSep 3, 2008
  7. Andreas EricssonSep 3, 2008
  8. Johan HerlandSep 3, 2008
  9. Mike HommeySep 3, 2008

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.