On 17 October 2012 04:23, Junio C Hamano wrote:
> 乙酸鋰 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 som
乙酸鋰 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 ignore
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
3 matches
Mail list logo
