I have checked it out with all three enabled in [1] but i still see the same number of buttons as before. How it should behave? I would like to have the rebase even in the squash but the comment above the "rebase: true" says "button" and not a "behavior" in another buttons e.g, "Squash and merge".
[1]: https://github.com/apache/maven-surefire/pull/295 On Tue, May 12, 2020 at 12:28 PM Hervé BOUTEMY <[email protected]> wrote: > it can be configured at ASF with .asf.yaml setting: > > https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories#id-.asf.yamlfeaturesforgitrepositories-Mergebuttons > > Le mardi 12 mai 2020, 00:45:31 CEST David Jencks a écrit : > > It's possible to configure GitHub to allow rebase and merge, which I > think > > is what you want. It may be possible to configure GitHub to only allow > > this. I’m not sure if this is something infra has to do or if a project > > admin can set it up. Camel recently made a related change. > > > > David Jencks > > > > > On May 11, 2020, at 3:23 PM, Benson Margulies <[email protected]> > > > wrote: > > > > > > Could you send me a pointer to refresh my memory on procedures? It's > been > > > a > > > while ... > > > > > > On Mon, May 11, 2020 at 1:42 PM Michael Osipov <[email protected]> > wrote: > > >> Folks, > > >> > > >> please do NOT merge via merge button in GitHub: > > >>> commit 158f54e3abc5c1d602146a08902482b6a19e2c27 (origin/master, > > >> > > >> origin/HEAD) > > >> > > >>> Merge: 34253e3d f7de3a6e > > >>> Author: Elliotte Rusty Harold <[email protected]> > > >>> Commit: GitHub <[email protected]> > > >>> > > >>> Merge pull request #66 from apache/plex > > >>> > > >>> [SCM-930] update plexus-utils > > >>> > > >>> commit f7de3a6ea5e182d7fab28e8f0548da2324097ba9 > > >>> Author: Elliotte Rusty Harold <[email protected]> > > >>> Commit: Elliotte Rusty Harold <[email protected]> > > >>> > > >>> update plexus-utils > > >> > > >> 1. It produces useless merge commits > > >> 2. GitHub is NOT a blessed committer > > >> > > >> It is OK, wenn a clean rebased merge is performed and not traces of > > >> GitHub are left. > > >> > > >> Michael > > >> > > >> --------------------------------------------------------------------- > > >> To unsubscribe, e-mail: [email protected] > > >> For additional commands, e-mail: [email protected] > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: [email protected] > > For additional commands, e-mail: [email protected] > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > >
