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

[PATCH 0/5] More recursive merge updates

From
Fredrik Kuivinen <freku045@student.liu.se>
Date
Sep 13, 2005, 21:37 UTC
Message-ID
<20050913213730.GA10953@c165.ib.student.liu.se>

Here is another patch series with updates to the recursive merge algorithm.

- Fredrik
Next: Fredrik Kuivinen
Message 1 of 6 in “More recursive merge updates”
  1. 0/5 More recursive merge updatesFredrik Kuivinen, Sep 13, 2005
  2. 1/5 Be more like the 'resolve' strategy.Fredrik Kuivinen, Sep 13, 2005
  3. 2/5 Don't output 'Automatic merge failed, ...'Fredrik Kuivinen, Sep 13, 2005
  4. 3/5 Adjust git-merge-recursive.py for the new tool names.Fredrik Kuivinen, Sep 13, 2005
  5. 4/5 Use a temporary index file when we merge the common ancestors.Fredrik Kuivinen, Sep 13, 2005
  6. 5/5 Use the 'die' function where it is appropriate.Fredrik Kuivinen, Sep 13, 2005

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.