As per discussion up to here: https://github.com/apache/incubator-pekko/pull/8#discussion_r1014136294
It looks like there's a need for agreement of "what the right way of working" is. I'm not going to repeat everything what was said there, but please do review. The gist is the following. 1. Should there be a strive for linear history? 2. Should squashing be used to achieve that linear history? 3. Should GitHub UI rebasing be allowed? Noting that that one destroys commit signatures. 4. Should commit signatures be used? My personal stance: 1. No, because it's not the Git way and because of #4 2. Allowed yes, but only when it makes sense, it should not be the default way. 3. No, because #4. Local rebasing (and squashing in the process) is still possible. But that will have clear committer tags and signatures. 4. Yes, traceability of changes has relevance in this modern day and age. On Thu, Nov 3, 2022 at 9:35 PM Matthew Benedict de Detrich <[email protected]> wrote: > Is now fixed thanks to https://github.com/apache/incubator-pekko/pull/8 > > -- > Matthew de Detrich > Aiven Deutschland GmbH > Immanuelkirchstraße 26, 10405 Berlin > Amtsgericht Charlottenburg, HRB 209739 B > > Geschäftsführer: Oskari Saarenmaa & Hannu Valtonen > m: +491603708037 > w: aiven.io e: [email protected] > On 3. Nov 2022 at 17:04 +0100, Matthew Benedict de Detrich < > [email protected]>, wrote: > > I just noticed that when > https://github.com/apache/incubator-pekko/pull/5 was merged it was done > via a merge commit. I think that this is a good time to discuss what method > of merging we should use. I would stick with rebase/squash and merge > because if you look at the git history of Akka you can see that we don’t > use merge commits. I just asked a fellow Flink committer how this is done > (since Flink also has the same setup, i.e. no merge commits) and apparently > a PMC member has to directly set it in the GitHub settings. > > > > @PJ Fanning, if we end up enforcing this on > https://github.com/apache/incubator-pekko then I would recommend rebase > the current main branch and pushing it to get rid of the merge commit so > the git history is clean. > > > > -- > > Matthew de Detrich > > Aiven Deutschland GmbH > > Immanuelkirchstraße 26, 10405 Berlin > > Amtsgericht Charlottenburg, HRB 209739 B > > > > Geschäftsführer: Oskari Saarenmaa & Hannu Valtonen > > m: +491603708037 > > w: aiven.io e: [email protected] >
