{"thread":{"id":"31835","subject":"Merge option suggestion (dictator, humble)","startedAt":"2012-10-16T15:52:09Z","lastAt":"2012-10-16T23:17:34Z","messageCount":3,"participants":["乙酸鋰","Junio C Hamano","Andrew Ardill"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"201347","messageId":"CAHtLG6TYEstro0J5jFJc1sZMoLC9gkHWrZdu4Y=hz-+kKkqXTQ@mail.gmail.com","threadId":"31835","inReplyTo":null,"subject":"Merge option suggestion (dictator, humble)","fromName":"乙酸鋰","fromEmail":"ch3cooli@gmail.com","sentAt":"2012-10-16T15:52:09Z","receivedAt":"2012-10-16T15:52:09Z","isPatch":false,"sender":{"key":"ch3cooli@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2804967?v=4"},"body":"Hi,\n\nI would like to suggest 2 merge options\n--dictator   use all my changes\n--humble   use all their changes\n\nThese allows to produce a fast-forward commit, without resolving any conflicts.\nSometimes, someone did something completely wrong, so the commit needs\nto be ignored.\nI cannot tell everyone in the world to run git fetch followed by git\nreset --hard.\n\nRegards,\n\nch3cooli\n"},{"id":"201363","messageId":"7vpq4is553.fsf@alter.siamese.dyndns.org","threadId":"31835","inReplyTo":"CAHtLG6TYEstro0J5jFJc1sZMoLC9gkHWrZdu4Y=hz-+kKkqXTQ@mail.gmail.com","subject":"Re: Merge option suggestion (dictator, humble)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-10-16T17:23:04Z","receivedAt":"2012-10-16T17:23:04Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"乙酸鋰 <ch3cooli@gmail.com> writes:\n\n> I would like to suggest 2 merge options\n> --dictator   use all my changes\n> --humble   use all their changes\n>\n> These allows to produce a fast-forward commit, without resolving any conflicts.\n> Sometimes, someone did something completely wrong, so the commit needs\n> to be ignored.\n\n> I cannot tell everyone in the world to run git fetch followed by git\n> reset --hard.\n\nThen you cannot tell them to use \"pull --humble\" either, can you?\n\nNot seeing any merit in the proposal (yet).\n"},{"id":"201393","messageId":"CAH5451me=JC5kL-_LZNaSrEX3b1MR6W6sa=A8CUtsxH480wm3g@mail.gmail.com","threadId":"31835","inReplyTo":"7vpq4is553.fsf@alter.siamese.dyndns.org","subject":"Re: Merge option suggestion (dictator, humble)","fromName":"Andrew Ardill","fromEmail":"andrew.ardill@gmail.com","sentAt":"2012-10-16T23:17:34Z","receivedAt":"2012-10-16T23:17:34Z","isPatch":false,"sender":{"key":"andrew.ardill@gmail.com","avatar":"https://gravatar.com/avatar/da14cb7c091dd44dc6c63a4d3361b149acaf25226dc78eb4131a17b93d9b0993?d=mp&s=160"},"body":"On 17 October 2012 04:23, Junio C Hamano <gitster@pobox.com> wrote:\n> 乙酸鋰 <ch3cooli@gmail.com> writes:\n>\n>> I would like to suggest 2 merge options\n>> --dictator   use all my changes\n>> --humble   use all their changes\n>>\n>> These allows to produce a fast-forward commit, without resolving any conflicts.\n>> Sometimes, someone did something completely wrong, so the commit needs\n>> to be ignored.\n>\n>> I cannot tell everyone in the world to run git fetch followed by git\n>> reset --hard.\n>\n> Then you cannot tell them to use \"pull --humble\" either, can you?\n>\n> Not seeing any merit in the proposal (yet).\n\nWould this allow setting up a project-default merge configuration for\ncontributors that defaulted to --humble? Not sure if that is useful or\nnot, but it at least seems safer than trying to default to doing reset\n--hard after every merge.\n\nRegards,\n\nAndrew Ardill\n"}]}