docs(merge-strategy): merge-queue arming with bare --auto + batch review fixes#105
Conversation
…iew fixes
Two merge-queue mechanics learned in practice:
- The queue owns the merge method, so 'gh pr merge --merge --auto' is rejected
('merge strategy for main is set by the merge queue'). Arm with a bare
'--auto'; keep explicit strategy only for --admin bypass merges.
- Each push to the PR head re-runs the full required matrix (~8min+), so
batch ALL review fixes into one commit/push instead of nitpick-by-nitpick.
Signed-off-by: Sebastian Mendel <info@sebastianmendel.de>
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request adds documentation on how to arm a merge-queue PR using the GitHub CLI without explicit strategy flags, and introduces a best practice of batching review-fix commits to save CI cycles. The review feedback focuses on improving technical accuracy—specifically clarifying that explicit strategies with --auto trigger a warning rather than rejection, distinguishing between PR CI and queue CI, and refining phrasing for consistency.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
Dependency Review✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.Scanned FilesNone |
github-actions
Bot
added
documentation
There was a problem hiding this comment.
Pull request overview
This PR updates the merge-queue guidance in merge-strategy.md to reflect practical gh pr merge behavior on merge-queue-enabled repositories and to reduce CI churn during review iterations.
Changes:
- Document using a bare
gh pr merge --auto(without--merge/--squash/--rebase) to arm auto-merge when the merge queue controls the merge method. - Add workflow guidance to batch review fixes into a single commit/push to avoid repeatedly re-running the full merge-queue CI matrix.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Explicit strategy with --auto warns but still enqueues (not 'rejected'). - Clarify each push re-runs the full PR CI (queue CI runs on the merge group). - Align headings to 'merge queue', label the gh output line, 'reply to and resolve' phrasing. Signed-off-by: Sebastian Mendel <info@sebastianmendel.de>
|
Adds two merge-queue mechanics to
references/merge-strategy.md(existing merge-queue section).--auto: the queue owns the merge method, sogh pr merge --merge --autois rejected (The merge strategy for main is set by the merge queue). Use a bare--auto; keep explicit strategy only for--adminbypass merges.Source: driving t3x-nr-llm PRs #307/#308/#309 through the merge queue.