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

Re: Bizarre git merge behaviour

From
Matthew Cengia <mattcen@gmail.com>
Date
Nov 20, 2013, 12:33 UTC
Message-ID
<20131120123320.GF26413@debian.cengia.id.au>
In-Reply-To
<528CAB40.8030107@viscovery.net>

On 2013-11-20 13:29, Johannes Sixt wrote: [...]

> That's strange. I can't tell what is going on. Perhaps you have some
> criss-cross merges in your history that merge-recursive trips over?

That's as good a guess as any, but I suspect tracking it down may involve needles and haystacks...

> 
> Sorry, I don't know how to help you further.
No worries, thanks very much for your help so far nonetheless.
-- 
Regards,
Matthew Cengia
Previous: Johannes SixtNext: Matthew Cengia
Message 5 of 7 in “Bizarre git merge behaviour”
  1. Matthew CengiaNov 20, 2013
  2. Johannes SixtNov 20, 2013
  3. Matthew CengiaNov 20, 2013
  4. Johannes SixtNov 20, 2013
  5. Matthew CengiaNov 20, 2013
  6. Matthew CengiaNov 21, 2013
  7. Jakub NarębskiNov 20, 2013

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.