Thiago, If we do not squash before merging two active branches with conflicts, the load is higher on the maintainers as a result of merge conflicts AND I must insist that every commit be reviewed on every branch so that pulling against any given commit id on the resulting release branch will provide a reasonably sane code base. I understand that mistakes happen and bug make it past review, but the going in proposition should be the we believe that every commit is thought good and complete.
I am open to changing the stance, but as a community we should make claims and promises that the community can rely on. Pat > -----Original Message----- > From: iotivity-dev-bounces at lists.iotivity.org [mailto:iotivity-dev- > bounces at lists.iotivity.org] On Behalf Of Thiago Macieira > Sent: Thursday, May 21, 2015 8:16 PM > To: Keane, Erich > Cc: iotivity-dev at lists.iotivity.org > Subject: Re: [dev] removal of the android_api branch > > On Thursday 21 May 2015 16:53:13 Keane, Erich wrote: > > It was squashed then rebased, so the history isn't on master. This > > was because gerrit doesn't permit merge commits, though I believe Aric > > has a really good reason for that. > > Gerrit certainly does permit that. Maybe our Gerrit is configured not to allow > it, so I'm interested in knowing why. > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center > > _______________________________________________ > iotivity-dev mailing list > iotivity-dev at lists.iotivity.org > https://lists.iotivity.org/mailman/listinfo/iotivity-dev
