Hi, Yes, this question is very good :)
For Apache APISIX, we usually use Squash instead of Merge, because our PRs may have a long commit log, and some commit messages are not useful actually, so we choose to use Squash only for now. Craig Russell <apache....@gmail.com>于2021年4月6日 周二上午7:26写道： > Hi Antonio, > > > On Apr 5, 2021, at 1:01 PM, antonio <anto...@vieiro.net> wrote: > > > > Hi all, > > > > First of all, apologies if this is not the proper list to ask these sort > of questions. If this is the case I'd appreciate some guidance on who to > ask these questions. > > IMHO this is a fine place to discuss this topic. > > > It seems github automatically changes author [1] and contributor [2] > details when one presses the "Squash and Merge" button, replacing these > with the author name and email (if present) of the Github account (and with > "GitHub nore...@github.com" otherwise). > > > > We discussed this in our mailing list a while back ([4], [5]) with no > clear consensus. > > > > The questions are: > > > > 1. Is there an ASF-wide policy (or consensus) on how to handle this > "Squash & Merge" feature in github? Or is this a project-specific decision? > > I believe this is a project-specific decision to make. Some projects > (Netbeans) are discussing disabling the feature in order to preserve > contributors for patches. > > But other projects (JDO) discussed this and agreed that the default should > be squash and merge because if a patch has many iterations, the commit > history gets very messy and it's hard to trace the progress of the patch as > it wanders through several stages. > > > > 2. Does the ASF want to keep track of contributor names/emails when PRs > are received+squashed+merged via github or is this Github behaviour ok? > > I would just caution projects to carefully consider the possibility of > losing provenance if using squash-merge protocols, especially if > contributions are being merged from non-committers. > > Regards, > Craig > > > > Thanks for any guidance, > > Antonio > > > > > > [1] > > Pull request "Squash and merge" button changes author details #1368 > > https://github.com/isaacs/github/issues/1368 > > > > [2] > > Contributors of squashed commits don't get any love #1303 > > https://github.com/isaacs/github/issues/1303 > > > > [3] > > Merging on github (aka Squash and Merge is broken) > > > http://mail-archives.apache.org/mod_mbox/netbeans-dev/201912.mbox/%3C6157b71ba7974359a3d1b9ae83bbb4a0ea2c9b2d.camel%40doppel-helix.eu%3E > > > > [4] > > [DISCUSS] github: Disable squash-and-merge button > > > http://mail-archives.apache.org/mod_mbox/netbeans-dev/202005.mbox/%3C76c36442eb90d3b4c6bfe76c51127549d05bc34e.camel%40doppel-helix.eu%3E > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: dev-unsubscr...@community.apache.org > > For additional commands, e-mail: dev-h...@community.apache.org > > > > Craig L Russell > c...@apache.org > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@community.apache.org > For additional commands, e-mail: dev-h...@community.apache.org > > -- 来自 琚致远
