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

Re: LCA2006 Git/Cogito tutorial

From
Horst von Brand <vonbrand@inf.utfsm.cl>
Date
Oct 23, 2005, 15:35 UTC
Message-ID
<200510231535.j9NFZrmD019309@inti.inf.utfsm.cl>
In-Reply-To
<pasky@suse.cz>
Petr Baudis <pasky@suse.cz> wrote:
[...]
> Well, it's true that cg-Xmergefile still does not handle all merge
> cases, but it certainly will not be silent about it, at least. ;-)

The Codeville <http://www.codeville.org> people seem to have taken a hard look at merging, but I don't find any clear references to their algorithm.

-- 
Dr. Horst H. von Brand                   User #22616 counter.li.org
Departamento de Informatica                     Fono: +56 32 654431
Universidad Tecnica Federico Santa Maria              +56 32 654239
Casilla 110-V, Valparaiso, Chile                Fax:  +56 32 797513
Previous: Petr BaudisNext: Petr Baudis
Message 5 of 12 in “Re: cg-mv”
  1. Horst von BrandOct 12, 2005
  2. Horst von BrandOct 21, 2005
  3. Horst von BrandOct 21, 2005
  4. Petr BaudisOct 23, 2005
  5. Horst von BrandOct 23, 2005
  6. Petr BaudisOct 23, 2005
  7. Horst von BrandOct 24, 2005
  8. Horst H. von BrandOct 25, 2006
  9. Junio C HamanoOct 25, 2006
  10. Horst H. von BrandOct 26, 2006
  11. Horst H. von BrandOct 27, 2006
  12. Jakub NarebskiOct 28, 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.