[GitHub] [incubator-pekko] jrudolph commented on a diff in pull request #8: Only allow Squash merges and update notification email addresses

[GitBox <gi...@apache.org>]

jrudolph commented on code in PR #8:
URL: https://github.com/apache/incubator-pekko/pull/8#discussion_r1013824815


##########
.asf.yaml:
##########
@@ -21,3 +21,16 @@ github:
     issues: true
     # Enable projects for project management boards
     projects: false
+
+  enabled_merge_buttons:
+    squash:  true
+    merge:   false
+    rebase:  false

Review Comment:
   It took me long years to accept squash commits as the best default in most situations (especially, compared to accidentally including WIP commits). A clean history has benefits especially compared to merging single commits. In some way it emphasizes the final history of the target project over the snapshot state a contributor worked on. I can see how this can become a problem in a big project like Linux but in smaller projects, simple histories seems worthwhile.
   
   On the other hand, there are situations (like the scala-3 merge in pekko-http) where we do want a merge. We do not want to squash self-contained commits by multiple contributors, and rebasing is also not an option in that case. So, in general, I prefer to have all options available, but I can also see how that can lead to occasional slipups where merge is used instead of squash.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org