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

Re: auto merge bug

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 5, 2013, 18:47 UTC
Message-ID
<7va9qhu1jk.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130305175904.GC9379@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> I'm also not sure how useful those really are in practice. I have not
> used "union" myself ever. And in the example that started this thread, I
> find the use of "union" slightly dubious.

Yeah, I do not think anybody sane used "union" outside toy examples. IIRC, it was originally done as a "if you want a GIGO, here it is, go hang yourself." response to "I am too lazy to resolve conflicts myself, Git should let me take both sides blindly."

Previous: Jeff KingNext: Andreas Ericsson
Message 6 of 9 in “auto merge bug”
  1. David KrmpoticMar 4, 2013
  2. Jeff KingMar 5, 2013
  3. Jeff KingMar 5, 2013
  4. Junio C HamanoMar 5, 2013
  5. Jeff KingMar 5, 2013
  6. Junio C HamanoMar 5, 2013
  7. Andreas EricssonMar 5, 2013
  8. David KrmpoticMar 5, 2013
  9. Jeff KingMar 6, 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.