(logging-flume) branch trunk updated: Allow “Rebase and Merge” (#463)

[pkarwasz]

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

ppkarwasz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/logging-flume.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 3318c38b Allow “Rebase and Merge” (#463)
3318c38b is described below

commit 3318c38bedb6243ce2d042e003a88b2e131a8b7a
Author: Piotr P. Karwasz <pkarwasz-git...@apache.org>
AuthorDate: Fri Jul 10 15:54:28 2026 +0200

    Allow “Rebase and Merge” (#463)
    
    Sometimes it is useful to preserve the individual commits of a PR.
---
 .asf.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index 7a2c1435..36921d86 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -48,10 +48,12 @@ github:
 
   # Enforce squashing while merging PRs.
   # Otherwise, the git log gets polluted severely.
+  #
+  # Exceptionally use `rebase` if individual commits are relevant.
   enabled_merge_buttons:
     squash: true
     merge: false
-    rebase: false
+    rebase: true
 
   features:
     issues: true