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

Re: Parallel refactoring and git merge nightmare

From
Michael Witten <mfwitten@gmail.com>
Date
Apr 11, 2012, 16:49 UTC
Message-ID
<CAMOZ1Bs4TwL8XD-N8wkkfzEUBHX_s6eh+Y+Ve=O1QN+Ja+XP5w@mail.gmail.com>
In-Reply-To
<1334160803.74554.YahooMailNeo@web160603.mail.bf1.yahoo.com>
2012/4/11 Pap Lôrinc <paplorinc@yahoo.com>:
> What am I doing wrong
Probably a lot.
Previous: Pap LôrincNext: David Aguilar
Message 2 of 9 in “Parallel refactoring and git merge nightmare”
  1. Pap LôrincApr 11, 2012
  2. Michael WittenApr 11, 2012
  3. David AguilarApr 12, 2012
  4. Pap LôrincApr 12, 2012
  5. Andrew ArdillApr 12, 2012
  6. David BarrApr 12, 2012
  7. Pap LôrincApr 12, 2012
  8. Eugene SajineApr 12, 2012
  9. Jeff KingApr 12, 2012

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.