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

Re: LCA2006 Git/Cogito tutorial

From
Petr Baudis <pasky@suse.cz>
Date
Oct 23, 2005, 22:40 UTC
Message-ID
<20051023224022.GX30889@pasky.or.cz>
In-Reply-To
<200510231533.j9NFXhOv019272@inti.inf.utfsm.cl>

Dear diary, on Sun, Oct 23, 2005 at 05:33:43PM CEST, I got a letter where Horst von Brand <vonbrand@inf.utfsm.cl> told me that...

Show 7 quoted lines
> Martin Langhoff (CatalystIT) <martin@catalyst.net.nz> wrote:
> [...]
> >     MERGE ERROR: : Not handling case  ->  ->
> 
> It happens when a new file with the same name appears in both parents. For
> example, we both see the need for a README file, and then I pull from you
> and try to merge into my version.

It certainly shouldn't happen with precisely that error message - there should be at least something written between the arrows. And yes, there are unhandled cases like that, as I wrote in one of my other mails.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.
Previous: Horst von BrandNext: Martin Langhoff
Message 2 of 3 in “Re: LCA2006 Git/Cogito tutorial”
  1. Horst von BrandOct 23, 2005
  2. Petr BaudisOct 23, 2005
  3. Martin LanghoffOct 24, 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.