(cloudberry-site) branch main updated: Enable GitHub auto-merge for pull requests

[dj...@apache.org]

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

tuhaihe pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry-site.git


The following commit(s) were added to refs/heads/main by this push:
     new 02cfcfe9b6 Enable GitHub auto-merge for pull requests
02cfcfe9b6 is described below

commit 02cfcfe9b6a3f0bfdccbae66a61837be03071985
Author: Dianjin Wang <wa...@gmail.com>
AuthorDate: Thu Oct 15 14:59:24 2026 +0800

    Enable GitHub auto-merge for pull requests
    
    Merging a PR by hand often means waiting for the last CI job to
    finish after it has already been approved.  Turn on GitHub's
    auto-merge so a committer can arm a PR once its commit history is
    ready, and GitHub merges it after the required reviews and status
    checks pass.  PRs that still need squashing or other history
    cleanup should keep being merged by hand.
    
    Also document the existing allow_update_branch and
    del_branch_on_merge settings under pull_requests.
    
    This follows the same change in the main repo, apache/cloudberry
    commit 977a348.
    
    See: https://lists.apache.org/thread/ys6k2g1jvoookhw788vhrrjpr24z31sp
    
    Assisted-by: Claude Code
---
 .asf.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index 0aa3ceca45..5d298872f0 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -59,8 +59,15 @@ github:
       # requires all conversations to be resolved before merging is possible
       required_conversation_resolution: true
   pull_requests:
-    # enable updating head branches of pull requests
+    # Allow a PR to be merged automatically once all required reviews
+    # and status checks pass.  Committers should only enable it on a PR
+    # whose commit history is already in a mergeable shape; PRs that
+    # need squashing or history cleanup are still merged by hand.
+    allow_auto_merge: true
+    # Show the "Update branch" button, since main requires branches to
+    # be up to date before merging (strict status checks)
     allow_update_branch: true
+    # Automatically delete head branches after merging
     del_branch_on_merge: true
   dependabot_alerts: true
   dependabot_updates: false


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