+1
On Sun, Jun 14, 2020 at 4:00 PM Evan Zelkowitz <e...@apache.org> wrote:
> +1
>
> On Sun, Jun 14, 2020 at 2:17 PM Alan Carroll
> <solidwallofc...@verizonmedia.com.invalid> wrote:
> >
> > +1
> >
> > On Sun, Jun 14, 2020 at 11:27 AM Leif Hedstrom <zw...@apache.org> wrote:
> >
> > > +1
> > >
> > > > On Jun 14, 2020, at 09:32, 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
> > > >
> > >
> > >
>
--
"Come to Me, all who are weary and heavy-laden, and I will
give you rest. Take My yoke upon you and learn from Me, for
I am gentle and humble in heart, and you will find rest for
your souls. For My yoke is easy and My burden is light."
~ Matthew 11:28-30
