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

Re: [RFC] custom strategies in builtin-merge

From
SRSverre Rabbelier <alturin@gmail.com>
Date
Jul 25, 2008, 11:50 UTC
Message-ID
<bd6139dc0807250450m25a932b8h68fcee13f8c343dc@mail.gmail.com>
In-Reply-To
<20080725113316.GF32057@genesis.frugalware.org>
On Fri, Jul 25, 2008 at 13:33, Miklos Vajna <vmiklos@frugalware.org> wrote:
> 1) Maintain a list of commands that has a git-merge- prefix, but not a
> strategy. This list would currently contain "base, file, index,
> one-file and tree".

Sounds a bit error prone, and could lead to unexpected results if/when someone creates a new command ('git merge status' anyone?) which is then suddenly treated as a merge strategy.

> 2) Require custom strategies to have a different naming scheme, like
> if "foo" is a custom strategy, then it would have to be named
> git-merge-custom-foo, _not_ git-merge-foo.

I think this is cleaner, what would be even nicer is to change the current names too, so name them all "git-merge-stragegy-foo".

-- 
Cheers,

Sverre Rabbelier
Previous: Miklos VajnaNext: Junio C Hamano
Message 2 of 6 in “[RFC] custom strategies in builtin-merge”
  1. Miklos VajnaJul 25, 2008
  2. Sverre RabbelierJul 25, 2008
  3. Junio C HamanoJul 26, 2008
  4. Johannes SchindelinJul 26, 2008
  5. Junio C HamanoJul 26, 2008
  6. Johannes SchindelinJul 26, 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.