+1

> On Jun 14, 2020, at 8:32 AM, Bryan Call <bc...@apache.org> wrote:
> 
> I would like to propose that we switch to "Squash and Merge" for GitHub as 
> the only option for merging pull requests.  This would mean we would remove 
> the options “Rebase and Merge” and “Create a merge commit”.
> 
> When a PR with multiple commits gets merged into the tree without squashing, 
> the release manager needs to track down all of the commits and cherry pick 
> each one of them into the release branch in order.  This change would 
> simplify the workflow for the release managers.
> 
> Unfortunately GitHub defaults to the last used merge option instead of being 
> to set a default for the project.  This is why it is better to remove the 
> other two options.
> 
> If you need to have multiple commits to go into the tree for a change, this 
> would require that multiple PRs would have to be created.  This should be a 
> rare event.
> 
> -Bryan
> 

Reply via email to