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

Re: [PATCH] builtin-merge: give a proper error message for invalid strategies in config

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 22, 2008, 05:01 UTC
Message-ID
<7vr69mpl5v.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<1216656647-16897-1-git-send-email-vmiklos@frugalware.org>
Miklos Vajna <vmiklos@frugalware.org> writes:
Show 5 quoted lines
> Till now 'git merge -s foobar' bailed out with an error message, but
> foobar in pull.twohead or pull.octopus was just silently ignored. It's
> better to inform the user then just silently doing nothing.
>
> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Doesn't this make "git merge -s 'recursive resolve'" to misbehave?
Previous: Miklos VajnaNext: Junio C Hamano
Message 2 of 6 in “builtin-merge: give a proper error message for invalid strategies in config”
  1. builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna, Jul 21, 2008
  2. Junio C HamanoJul 22, 2008
  3. Junio C HamanoJul 22, 2008
  4. Miklos VajnaJul 22, 2008
  5. Junio C HamanoJul 22, 2008
  6. t7601: extend the 'merge picks up the best result' testMiklos Vajna, Jul 22, 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.