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

Re: [RFC/PATCH] Option to revert order of parents in merge commit

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 26, 2012, 17:58 UTC
Message-ID
<7v8v9otfdy.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20121126124200.GA29859@camk.edu.pl>
Kacper Kornet <draenog@pld-linux.org> writes:
Show 7 quoted lines
>> Is there any interaction between this "pull --reverse-parents"
>> change and possible conflict resolution when the command stops and
>> asks the user for help?  For example, whom should "--ours" and "-X
>> ours" refer to?  Us, or the upstream?
>
> The change of order of parents happens at the very last moment, so
> "ours" in merge options is local version and "theirs" upstream.

That may be something that wants to go to the proposed commit log message. I am neutral on the "feature" (i.e. not against it but not extremely enthusiastic about it either).

Thanks.
Previous: Kacper KornetNext: Aaron Schrab
Message 4 of 5 in “Option to revert order of parents in merge commit”
  1. Option to revert order of parents in merge commitKacper Kornet, Nov 23, 2012
  2. Junio C HamanoNov 24, 2012
  3. Kacper KornetNov 26, 2012
  4. Junio C HamanoNov 26, 2012
  5. Aaron SchrabNov 26, 2012

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.