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

Re: Challenges for an octopus merge

From
MEMarkus Elfring <markus.elfring@web.de>
Date
Apr 8, 2011, 15:27 UTC
Message-ID
<4D9F2973.2090400@web.de>
In-Reply-To
<4D53F694.1060105@web.de>
> Automatic merge failed; fix conflicts and then commit the result.

I would appreciate if the implementations of merge procedures could be improved so that work results like the following can be achieved in an easier way. https://github.com/elfring/BtYacc/tree/route1

Can any documentation updates help in this use case, too?

Regards, Markus

Previous: Markus Elfring
Message 7 of 7 in “Challenges for an octopus merge”
  1. Markus ElfringFeb 10, 2011
  2. Junio C HamanoFeb 10, 2011
  3. Markus ElfringFeb 11, 2011
  4. Junio C HamanoFeb 11, 2011
  5. Markus ElfringFeb 12, 2011
  6. Markus ElfringFeb 15, 2011
  7. Markus ElfringApr 8, 2011

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.