From 4ac7410a8f1fff164f9a800f2e8e7b9cb252ee0f Mon Sep 17 00:00:00 2001 From: Dianjin Wang Date: Mon, 28 Sep 2026 11:32:37 +0800 Subject: [PATCH] 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 enable the "Update branch" button. main uses strict status checks, so a PR that falls behind main cannot be auto-merged until its branch is brought up to date. While here, move del_branch_on_merge under pull_requests, as the top-level key is deprecated by ASF infra, and fix its comment, which said the opposite of what the setting does. See: https://lists.apache.org/thread/ys6k2g1jvoookhw788vhrrjpr24z31sp Assisted-by: Claude Code --- .asf.yaml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 78682d6a3d7..7396951b308 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -147,9 +147,18 @@ github: # Require conversation threads to be resolved required_conversation_resolution: true - # Branch cleanup settings - # Don't automatically delete branches after merging - del_branch_on_merge: true + # Pull request settings + 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 security settings # Enable security vulnerability alerts