Skip to content

Enable GitHub auto-merge for pull requests - #174

Merged
tuhaihe merged 1 commit into
apache:mainfrom
tuhaihe:asf/enable-auto-merge
Oct 15, 2026
Merged

tuhaihe merged 1 commit into
apache:mainfrom
tuhaihe:asf/enable-auto-merge

Conversation

@tuhaihe

@tuhaihe tuhaihe commented Oct 15, 2026

Copy link
Copy Markdown
Member

Summary

Follows apache/cloudberry@977a348 and adds the same settings to .asf.yaml:

  • allow_auto_merge: true: 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 need squashing or history cleanup should still be merged by hand.
  • allow_update_branch: true: shows the "Update branch" button. main uses strict status checks, so a PR that falls behind main can't be auto-merged until its branch is updated.
  • del_branch_on_merge moves under pull_requests, because ASF infra has deprecated the top-level key. Its value doesn't change.

Discussion: https://lists.apache.org/thread/ys6k2g1jvoookhw788vhrrjpr24z31sp

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@977a348.

See: https://lists.apache.org/thread/ys6k2g1jvoookhw788vhrrjpr24z31sp

Assisted-by: Claude Code
@tuhaihe
tuhaihe merged commit 40961b7 into apache:main Oct 15, 2026
75 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants