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

Re: Cogito wishlist: ability to set merge strategy

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Jan 18, 2006, 20:14 UTC
Message-ID
<46a038f90601181214m54318d89we505c130e4f397e2@mail.gmail.com>
In-Reply-To
<20060118193201.GV28365@pasky.or.cz>
On 1/19/06, Petr Baudis <pasky@suse.cz> wrote:
> though. From the Git merge strategies, I guess only recursive is
> useful for Cogito...

I haven't had time to figure out where the problem is, I do have some cases where git-merge does the right thing, and cg-merge gets it wrong. And without renames.

An example from yesterday: http://locke.catalyst.net.nz/gitweb?p=moodle.git;a=commit;h=b69d60a5141dfe22a073dd9931e6c8ff5dded0b9

(the repo is accessble via http://locke.catalyst.net.nz/git/moodle.org if anyone is interested)

> Patches welcome.  ;-)

I know I promised patches in that direction, but I haven't had the time to look into it. Sorry! (and, as a user, I just cheat and fall back to git-merge)

cheers,
martin
Previous: Petr BaudisNext: Martin Langhoff
Message 6 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.