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

Re: 'git notes merge' implementation questions

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 22, 2010, 00:12 UTC
Message-ID
<7v8w8g8hvt.fsf@alter.siamese.dyndns.org>
In-Reply-To
<201004220208.03706.johan@herland.net>
Johan Herland <johan@herland.net> writes:
> Ok, I'm just worried that it'll force us to re-implement much of the three-
> way merge logic that's already implemented in the merge machinery.

There is no way around it, as long as you have that variable fan-out in the notes structure. Changing and unstabilizing "merge" for dubious benefit of code reuse is unacceptable, as the part that deals with variable fan-out has no benefit to the regular "merge".

Previous: Johan HerlandNext: Johan Herland
Message 7 of 10 in “'git notes merge' implementation questions”
  1. Johan HerlandApr 21, 2010
  2. Jonathan NiederApr 21, 2010
  3. Johan HerlandApr 21, 2010
  4. Jonathan NiederApr 22, 2010
  5. Junio C HamanoApr 21, 2010
  6. Johan HerlandApr 22, 2010
  7. Junio C HamanoApr 22, 2010
  8. Johan HerlandApr 22, 2010
  9. Junio C HamanoApr 22, 2010
  10. Johan HerlandApr 22, 2010

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.