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

Re: [PATCH] Documentation: mention how to define multiple strategies

From
Miklos Vajna <vmiklos@frugalware.org>
Date
May 16, 2008, 00:18 UTC
Message-ID
<20080516001802.GS27724@genesis.frugalware.org>
In-Reply-To
<7vfxsjf7zy.fsf@gitster.siamese.dyndns.org>
On Thu, May 15, 2008 at 04:44:01PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
Show 8 quoted lines
> It indeed is supported to give multiple strategies and let "git merge" try
> each of them.
> 
> However, I have a very strong doubt if it is really worth keeping the
> support, let alone advertising it.
> 
> Really.  It was a fun experiment while it was being invented, but I never
> saw any practical usefulness with it.

As a general rule, I try to change nothing while working on builtin-merge. Should I drop support for it (making an exception here), or will you accept tests for this, just you would like to exclude it from documentation?

Thanks.
Previous: Junio C Hamano
Message 3 of 3 in “Documentation: mention how to define multiple strategies”
  1. Documentation: mention how to define multiple strategiesMiklos Vajna, May 15, 2008
  2. Junio C HamanoMay 15, 2008
  3. Miklos VajnaMay 16, 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.