Ok, I went ahead and changed it in gerrit. Let me know if you have any problems with it.
On Mon, Dec 11, 2017 at 11:58 AM, Philip Zeyliger <[email protected]> wrote: > Seems like it's the right thing to do. > > On Mon, Dec 11, 2017 at 11:43 AM, Tim Armstrong <[email protected]> > wrote: > > > We recently had a bad merge that was allowed by the cherry-pick merge > > strategy merging a simple without its ancestor (since they didn't change > > any nearby lines): > > https://lists.apache.org/thread.html/ee81ee3e396a9a7b1214d92d713a2d > > 28f2f1f7058184504ebc399170@%3Cdev.impala.apache.org%3E > > > > It looks like the "rebase always" merge strategy avoids this by always > > trying to rebase and merge the whole chain of commits. Does anyone have > any > > objections or thoughts about switching to this strategy? > > >
