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]
