# Merge option suggestion (dictator, humble)

3 messages from 2012-10-16 to 2012-10-16. Participants: 乙酸鋰, Junio C Hamano, Andrew Ardill.
Thread: https://gitlist.dev/t/31835

## 乙酸鋰, 2012-10-16 15:52

Subject: Merge option suggestion (dictator, humble)
Message-ID: <CAHtLG6TYEstro0J5jFJc1sZMoLC9gkHWrZdu4Y=hz-+kKkqXTQ@mail.gmail.com>
URL: https://gitlist.dev/e/CAHtLG6TYEstro0J5jFJc1sZMoLC9gkHWrZdu4Y%3Dhz-%2BkKkqXTQ%40mail.gmail.com

```
Hi,

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.

Regards,

ch3cooli

```

## Junio C Hamano, 2012-10-16 17:23

Subject: Re: Merge option suggestion (dictator, humble)
Message-ID: <7vpq4is553.fsf@alter.siamese.dyndns.org>
URL: https://gitlist.dev/e/7vpq4is553.fsf%40alter.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).

```

## Andrew Ardill, 2012-10-16 23:17

Subject: Re: Merge option suggestion (dictator, humble)
Message-ID: <CAH5451me=JC5kL-_LZNaSrEX3b1MR6W6sa=A8CUtsxH480wm3g@mail.gmail.com>
URL: https://gitlist.dev/e/CAH5451me%3DJC5kL-_LZNaSrEX3b1MR6W6sa%3DA8CUtsxH480wm3g%40mail.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

```