Skip to content

Commit 1891652

Browse files
authored
docs: clarify auto-merge ownership (#762)
1 parent 0552132 commit 1891652

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

‎AGENTS.md‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,17 @@
8383
- Local commits are checkpoints and do not trigger CI. Complete related implementation and review before the first push.
8484
- Run targeted regressions and fast local static checks before pushing. Do not delay a ready commit or push solely to run or wait for long full integration or end-to-end suites that CI already executes; run those locally only to reproduce or diagnose the change, or when the user explicitly requests them. CI remains the required broad-suite gate.
8585
- Review the complete local diff against the target branch and resolve findings before pushing. Do not push partial or overlapping branches merely to start CI.
86-
- Push once and open one ready pull request so CI and configured auto-merge can complete delivery.
87-
- After auto-merge is enabled, do not invoke a manual merge while the automation is healthy. Watch the pull request through merge in the foreground when no other useful work remains, or keep a background watch running while continuing independent work. Use a manual merge only with concrete evidence that auto-merge is broken or unavailable, and document that evidence and the fallback reason first.
86+
- Push once and open one ready pull request, then immediately enable squash auto-merge unless the
87+
user explicitly asks to leave that pull request unmerged. The delivery agent owns enabling
88+
auto-merge; do not assume a separate GitHub workflow or bot will enable it. Verify the pull
89+
request reports an active auto-merge request, or confirm it completed as a squash merge
90+
immediately after the enable command when all required checks had already passed.
91+
- Do not interpret "do not manually merge" as permission to leave auto-merge disabled. It means
92+
enable auto-merge and let GitHub merge after required checks pass. Do not invoke a manual merge
93+
while the automation is healthy. Watch the pull request through merge in the foreground when no
94+
other useful work remains, or keep a background watch running while continuing independent work.
95+
Use a manual merge only with concrete evidence that auto-merge is broken or unavailable, and
96+
document that evidence and the fallback reason first.
8897
- PR titles must follow Conventional Commits. Descriptions must be no longer than 2,000 characters and contain non-empty `## Why`, `## Changes`, and `## Verification` sections in that order.
8998
- Before creating or editing a PR, validate its metadata with `make check-pr-metadata PR_TITLE='type: summary' PR_BODY_FILE=/path/to/body.md`.
9099
- Monitor CI after every push and follow it through completion. Address failures before considering delivery complete.

0 commit comments

Comments
 (0)