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

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

From
Andreas Ericsson <ae@op5.se>
Date
Sep 3, 2008, 11:04 UTC
Message-ID
<48BE6F37.3070302@op5.se>
In-Reply-To
<48BE56BD.6050805@gmail.com>
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?
>

I believe that one would still fail for this case, as "ImplicitUndo" isn't included.

Besides that, I'd rather have something simple that does something predictable than something complex that pushes the "gets it right" figure from 98% to 99.2%, while failing in completely annoying and surprising ways sometimes. Someone or something still has to verify that the merge produced something sane.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231
Previous: Ittay DrorNext: Johan Herland
Message 7 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.