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

Re: Merge option suggestion (dictator, humble)

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 16, 2012, 17:23 UTC
Message-ID
<7vpq4is553.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAHtLG6TYEstro0J5jFJc1sZMoLC9gkHWrZdu4Y=hz-+kKkqXTQ@mail.gmail.com>
乙酸鋰 <ch3cooli@gmail.com> writes:
Show 7 quoted lines
> I would like to suggest 2 merge options
> --dictator   use all my changes
> --humble   use all their changes
>
> These allows to produce a fast-forward commit, without resolving any conflicts.
> Sometimes, someone did something completely wrong, so the commit needs
> to be ignored.
> I cannot tell everyone in the world to run git fetch followed by git
> reset --hard.
Then you cannot tell them to use "pull --humble" either, can you?
Not seeing any merit in the proposal (yet).
Previous: 乙酸鋰Next: Andrew Ardill
Message 2 of 3 in “Merge option suggestion (dictator, humble)”
  1. 乙酸鋰Oct 16, 2012
  2. Junio C HamanoOct 16, 2012
  3. Andrew ArdillOct 16, 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.