From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Oct 2012 17:23:04 GMT
Subject: Re: Merge option suggestion (dictator, humble)
Message-ID: <7vpq4is553.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAHtLG6TYEstro0J5jFJc1sZMoLC9gkHWrZdu4Y=hz-+kKkqXTQ@mail.gmail.com>

乙酸鋰 <ch3cooli@gmail.com> writes:

> 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).