You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@logging.apache.org by vy...@apache.org on 2024/07/17 07:08:16 UTC

(logging-log4j-scala) branch main updated: Enforce squashing while merging PRs

This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-scala.git


The following commit(s) were added to refs/heads/main by this push:
     new a3f28f4  Enforce squashing while merging PRs
a3f28f4 is described below

commit a3f28f4a2d9ea4ae26748ff4a940808a5b2133b9
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Wed Jul 17 09:08:58 2024 +0200

    Enforce squashing while merging PRs
---
 .asf.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index cb8a364..3fa0b5d 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -48,6 +48,13 @@ github:
 
   del_branch_on_merge: true
 
+  # Enforce squashing while merging PRs.
+  # Otherwise, the git log gets polluted severely.
+  enabled_merge_buttons:
+    squash:  true
+    merge:   false
+    rebase:  false
+
   features:
     issues: true