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


Andrew Ardill
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to