threads / discuss / 31835

Merge option suggestion (dictator, humble)

Subject: Merge option suggestion (dictator, humble)

## tl;dr

3 messages between Oct 16, 2012 and Oct 16, 2012.

replies: 2people: 3as markdown or json

乙酸鋰· Oct 16, 2012, 15:52 UTC · lore

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· Oct 16, 2012, 17:23 UTC · re: 乙酸鋰 · lore

Re: Merge option suggestion (dictator, humble)

乙酸鋰 <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).

Andrew Ardill· Oct 16, 2012, 23:17 UTC · re: Junio C Hamano · lore

Re: Merge option suggestion (dictator, humble)

On 17 October 2012 04:23, Junio C Hamano <gitster@pobox.com> wrote:

Show 16 quoted lines

> 乙酸鋰 <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