From: Andrew Ardill <andrew.ardill@gmail.com>
Date: Tue, 16 Oct 2012 23:17:34 GMT
Subject: Re: Merge option suggestion (dictator, humble)
Message-ID: <CAH5451me=JC5kL-_LZNaSrEX3b1MR6W6sa=A8CUtsxH480wm3g@mail.gmail.com>
In-Reply-To: <7vpq4is553.fsf@alter.siamese.dyndns.org>

On 17 October 2012 04:23, Junio C Hamano <gitster@pobox.com> wrote:
> 乙酸鋰 <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).

Would this allow setting up a project-default merge configuration for
contributors that defaulted to --humble? Not sure if that is useful or
not, but it at least seems safer than trying to default to doing reset
--hard after every merge.

Regards,

Andrew Ardill