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

Re: [PATCH 3/4] Add a new test for using a custom merge strategy

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Jul 30, 2008, 17:25 UTC
Message-ID
<20080730172532.GF32057@genesis.frugalware.org>
In-Reply-To
<7vabg09rye.fsf@gitster.siamese.dyndns.org>
On Tue, Jul 29, 2008 at 04:43:53PM -0700, Junio C Hamano <gitster@pobox.com> wrote:
Show 5 quoted lines
> By the way, this eval shows why "theirs" cannot be a symmetric operation
> of "ours".  You are taking the last remote HEAD even when you are merging
> more than one remote into the current branch at once.  "ours" can be
> sensibly defined for an octopus, but "theirs" has this "which theirs"
> problem ;-)

Oh, well, sure. But _if_ it turns out there is a demand for that kind of git-merge-theirs, then I suppose we could still give up if we are given two or more remotes, just like merge-resolve and others do.

Previous: Junio C HamanoNext: Junio C Hamano
Message 9 of 10 in “Allow custom merge strategies, take 4”
  1. 0/4 Allow custom merge strategies, take 4Miklos Vajna, Jul 29, 2008
  2. 1/4 builtin-help: make some internal functions available to other builtinsMiklos Vajna, Jul 29, 2008
  3. 2/4 builtin-merge: allow using a custom strategyMiklos Vajna, Jul 29, 2008
  4. 3/4 Add a new test for using a custom merge strategyMiklos Vajna, Jul 29, 2008
  5. 4/4 Add a second testcase for handling invalid strategies in git-mergeMiklos Vajna, Jul 29, 2008
  6. Junio C HamanoJul 29, 2008
  7. Miklos VajnaJul 30, 2008
  8. Junio C HamanoJul 29, 2008
  9. Miklos VajnaJul 30, 2008
  10. Junio C HamanoJul 30, 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.