Merge option suggestion (dictator, humble)

2012-10-16 Thread 乙酸鋰
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

Re: Merge option suggestion (dictator, humble)

2012-10-16 Thread Junio C Hamano
乙酸鋰 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

Re: Merge option suggestion (dictator, humble)

2012-10-16 Thread Andrew Ardill
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.