Re: Merging via GitHub

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Re: Merging via GitHub

Tibor Digana
This probably happens when the committer has pressed "Squash and merge". I
expect it does not rebase.
But when you press "Rebase and merge" then the commits would be rebased on
the HEAD but it does not squash the commits to one.

So you have to check the parent commit. If it is old then the contributor
has to squash all his commits and the committer will push "Rebase and
merge".
This would work.
If the parent is the HEAD commit then it should not be a problem to "Squash
and merge".


On Mon, May 11, 2020 at 10:42 PM Michael Osipov <[hidden email]> wrote:

> Folks,
>
> please do NOT merge via merge button in GitHub:
>
> > commit 158f54e3abc5c1d602146a08902482b6a19e2c27 (origin/master,
> origin/HEAD)
> > Merge: 34253e3d f7de3a6e
> > Author: Elliotte Rusty Harold <[hidden email]>
> > Commit: GitHub <[hidden email]>
> >
> >     Merge pull request #66 from apache/plex
> >
> >     [SCM-930] update plexus-utils
> >
> > commit f7de3a6ea5e182d7fab28e8f0548da2324097ba9
> > Author: Elliotte Rusty Harold <[hidden email]>
> > Commit: Elliotte Rusty Harold <[hidden email]>
> >
> >     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: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>