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

Re: Cogito wishlist: ability to set merge strategy

From
Petr Baudis <pasky@suse.cz>
Date
Jan 18, 2006, 19:32 UTC
Message-ID
<20060118193201.GV28365@pasky.or.cz>
In-Reply-To
<46a038f90601181006u40a1f8e1n47c27651a4cab3d@mail.gmail.com>

Dear diary, on Tue, Jan 17, 2006 at 04:29:49AM CET, I got a letter where "H. Peter Anvin" <hpa@zytor.com> said that...

> 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.

Dear diary, on Wed, Jan 18, 2006 at 07:06:07PM CET, I got a letter where Martin Langhoff <martin.langhoff@gmail.com> said that...

> One of these days I'll convince Pasky to use git-merge for
> cg-merge's internals.

For the record, I acknowledge that the merge strategies are useful and I plan to make cg-merge use them, but I'm unable to tell when that will happen. I would still like to keep the current Cogito merging the default merge strategy at least for a while until the dust settles down, though. From the Git merge strategies, I guess only recursive is useful for Cogito...

Patches welcome.  ;-)
-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Of the 3 great composers Mozart tells us what it's like to be human,
Beethoven tells us what it's like to be Beethoven and Bach tells us
what it's like to be the universe.  -- Douglas Adams
Previous: Martin LanghoffNext: Martin Langhoff
Message 5 of 10 in “"tla missing -s" equivalent with git/cogito”
  1. Belmar-LetelierJan 18, 2006
  2. Andreas EricssonJan 18, 2006
  3. Junio C HamanoJan 18, 2006
  4. Martin LanghoffJan 18, 2006
  5. Petr BaudisJan 18, 2006
  6. Martin LanghoffJan 18, 2006
  7. Martin LanghoffJan 18, 2006
  8. Petr BaudisJan 18, 2006
  9. Martin LanghoffJan 18, 2006
  10. Petr BaudisJan 18, 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.