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

vinish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-xtable.git


The following commit(s) were added to refs/heads/main by this push:
     new d4ffce6a Enable squash and merge in .asf.yaml for xtable
d4ffce6a is described below

commit d4ffce6a787983d460e0cd5050348a3a550e7b35
Author: Vinish Reddy <vin...@apache.org>
AuthorDate: Mon Apr 7 21:16:17 2025 -0700

    Enable squash and merge in .asf.yaml for xtable
---
 .asf.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 339a8d73..8aaedd4f 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -27,12 +27,10 @@ github:
     projects: true
     discussions: true
   enabled_merge_buttons:
-    # "squash and merge" replaces committer with noreply@github, and we don't 
want that
-    # See https://lists.apache.org/thread/vxxpt1x316kjryb4dptsbs95p66d9xrv
-    squash:  false
+    squash:  true
     # We prefer linear history, so creating merge commits is disabled in UI
     merge:   false
-    rebase:  true
+    rebase:  false
   protected_branches:
     main:
       required_pull_request_reviews:

Reply via email to