On Wed, Jul 12, 2017 at 12:08 PM, Robert Bradshaw < rober...@google.com.invalid> wrote:
> On Tue, Jul 11, 2017 at 7:14 PM, Kenneth Knowles <k...@google.com.invalid> > wrote: > > > The thing is that "fixup! <prior subject line>" indicates that this fixup > > should be reordered and applied to the referenced commit. Squashing in > > order is not correct. I think the bot reordering to squash is not a good > > idea. > > I don't see why reordering in this case is a bad thing (if it applies > cleanly--one could even automatically check that the patches commute). > > > So maybe I wasn't clear about the options I want. I want both of: > > > > (1) The bot merges the commits exactly as they are (for the > > git-knowledgable) > > (2) The bot squashes all the commits in order (for casual contributors) > > > > Way simpler than anything interactive and with no reording by the bot. > > The rest of my thoughts were just ways to further avoid messing this up. > > Yeah, these are the most common, and I highly agree should make it > hard to accidentally merge fixup commits. I would like to support the > (common) case of an advanced user having fixup commits in the review, > but being able to merge without waiting for her to manually squash > them after the LGTM. > OK, yea, I think it is fair to allow the bot to try to reorder if it goes cleanly. So sounds good to me. Kenn
