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

Cogito wishlist: ability to set merge strategy

From
HAH. Peter Anvin <hpa@zytor.com>
Date
Jan 17, 2006, 03:29 UTC
Message-ID
<43CC64AD.30606@zytor.com>

It would be nice if Cogito would let one override the default merge strategy, i.e. to use the recursive merge strategy. I've had some moderate luck with using recursive merge for the klibc trees recently.

	-hpa
Message 1 of 1 in “Cogito wishlist: ability to set merge strategy”
  1. H. Peter AnvinJan 17, 2006

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.