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/ee81ee3e396a9a7b1214d92d713a2d28f2f1f7058184504ebc399170@%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?
