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

Re: [PATCH 2/2] merge: let custom strategies intervene in trivial merges

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 16, 2010, 03:39 UTC
Message-ID
<7vbp93dy4w.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20100816011106.GB22573@burratino>
Jonathan Nieder <jrnieder@gmail.com> writes:
> As v1.6.1-rc1~294^2 (2008-08-23) explains, custom merge strategies
> do not even kick in when the merge is truly trivial.  But they
> should, since otherwise a custom “--strategy=theirs” is not useful.

I think it is a double-edged sword that trivial merge kicks in for custom strategies. If your mind is focused narrowly on "ours" or "theirs", indeed it may be inconvenient, but on the other hand other custom strategies may not want to run heavy-weight operations if a trivial merge is sufficient.

So in the longer term, I suspect that each custom strategy needs to be able to tell the merge machinery if it wants ff and trivial.

Previous: Jonathan Nieder
Message 4 of 4 in “set NO_TRIVIAL for custom merge strategies”
  1. 0/2 set NO_TRIVIAL for custom merge strategiesJonathan Nieder, Aug 16, 2010
  2. 1/2 t7606 (merge-theirs): modernize styleJonathan Nieder, Aug 16, 2010
  3. 2/2 merge: let custom strategies intervene in trivial mergesJonathan Nieder, Aug 16, 2010
  4. Junio C HamanoAug 16, 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.