From 8b661e9b8b1ce1a7b094eab1660cddb0fe4e5c08 Mon Sep 17 00:00:00 2001 From: Dianjin Wang Date: Thu, 15 Oct 2026 14:59:49 +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. This follows apache/cloudberry@977a348c4c3dac7d77bae369c3dee4880944629f. See: https://lists.apache.org/thread/ys6k2g1jvoookhw788vhrrjpr24z31sp Assisted-by: Claude Code --- .asf.yaml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 1b6252a65..72c619d91 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -69,7 +69,20 @@ github: # requires all conversations to be resolved before merging is possible required_conversation_resolution: true - 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_alerts: true dependabot_updates: false protected_tags: