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

Re: theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 29, 2008, 06:35 UTC
Message-ID
<7viqupkxjh.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20080729050845.GE26997@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 7 quoted lines
> Your reason was "it keeps your crap in the history". And while I
> generally am in favor of getting rid of crap and keeping a clean
> history, I think it is very much dependent on the individual project's
> preferences. IOW, that history might not contain "crap" but rather
> now-obsolete changes that are of historical interest.
>
> But I do agree that -Xtheirs is crap. ;)

Yes, that is why I did not merge 'master' with "theirs" merge into it to subsume it. I reverted -Xtheirs from 'next' (due to "never-rewind during the cycle" rule) and intend to rebuild 'next' without it when 1.6.0 ships.

However, that does not keep me from holding onto its tip privately (and I do, as the machinery to pass -Xoption through git-merge to backends would be useful later).

IOW, "now-obsolete changes that are of historical interest" does not necessarily justify a "subsuming" merge using "-s ours" or "-s theirs".

Previous: Jeff King
Message 28 of 28 in “theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy”
  1. Sverre RabbelierJul 28, 2008
  2. Miklos VajnaJul 28, 2008
  3. Sverre RabbelierJul 28, 2008
  4. Jeff KingJul 28, 2008
  5. Johannes SchindelinJul 28, 2008
  6. Jeff KingJul 28, 2008
  7. Avery PennarunJul 28, 2008
  8. Johannes SchindelinJul 28, 2008
  9. Sverre RabbelierJul 29, 2008
  10. Jeff KingJul 29, 2008
  11. Jeff KingJul 29, 2008
  12. Johannes SchindelinJul 29, 2008
  13. Jeff KingJul 29, 2008
  14. Sverre RabbelierJul 29, 2008
  15. Junio C HamanoJul 29, 2008
  16. Jeff KingJul 29, 2008
  17. Mike RalphsonJul 29, 2008
  18. Jeff KingJul 29, 2008
  19. Sverre RabbelierJul 28, 2008
  20. Junio C HamanoJul 28, 2008
  21. Sverre RabbelierJul 28, 2008
  22. Junio C HamanoJul 28, 2008
  23. Sverre RabbelierJul 28, 2008
  24. Junio C HamanoJul 28, 2008
  25. Junio C HamanoJul 28, 2008
  26. Sverre RabbelierJul 28, 2008
  27. Jeff KingJul 29, 2008
  28. Junio C HamanoJul 29, 2008

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.