* Merge option suggestion (dictator, humble)
@ 2012-10-16 15:52 乙酸鋰
2012-10-16 17:23 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: 乙酸鋰 @ 2012-10-16 15:52 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Merge option suggestion (dictator, humble)
2012-10-16 15:52 Merge option suggestion (dictator, humble) 乙酸鋰
@ 2012-10-16 17:23 ` Junio C Hamano
2012-10-16 23:17 ` Andrew Ardill
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2012-10-16 17:23 UTC (permalink / raw)
To: 乙酸鋰; +Cc: git
乙酸鋰 <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).
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Merge option suggestion (dictator, humble)
2012-10-16 17:23 ` Junio C Hamano
@ 2012-10-16 23:17 ` Andrew Ardill
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ardill @ 2012-10-16 23:17 UTC (permalink / raw)
To: Junio C Hamano; +Cc: 乙酸鋰, git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-16 23:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-16 15:52 Merge option suggestion (dictator, humble) 乙酸鋰
2012-10-16 17:23 ` Junio C Hamano
2012-10-16 23:17 ` Andrew Ardill
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).