Skip to content

Commit 202cb8c

Browse files
committed
docs(skills): keep --squash so merges work with and without a queue
Without a merge strategy, `gh pr merge` fails in a non-interactive session on a base branch with no merge queue: stacked PRs into feature branches, and main until the ruleset is enabled. With a queue, gh only warns that the queue sets the strategy and enqueues the PR, so `--squash` works on both. `--delete-branch` is still left out, because gh rejects it when a queue is required.
1 parent 84c366d commit 202cb8c

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎.agents/skills/create-pr/SKILL.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ A PR is one reviewable responsibility and may hold several atomic commits. A bra
1515
2. Push and open the PR — `references/open-pr.md`. A squash merge writes the PR title as the commit subject on `main`, so CI holds the title to the same Conventional Commit scope rules the `commit` skill describes.
1616
3. Request and handle AI review — `references/ai-review.md`, with the `gh` reply and thread-state calls in `references/gh-review.md`.
1717
4. Watch CI after opening and after every push with `gh pr checks`. Read the failing step logs and annotations rather than the summary, then use the `fix-ci` skill for the fix, and ask the bots for another pass if they do not rerun on their own.
18-
5. Merge only when the user explicitly asks and the conditions below hold: `gh pr merge <pr>` adds the PR to `main`'s merge queue, which squashes it; pass no merge-method or `--body-file` flags. When the PR fixes an issue someone else reported, credit that reporter with a `Co-authored-by` trailer on one of the PR's commits before queuing, using their noreply address `<id>+<login>@users.noreply.github.com` (`gh api users/<login> --jq .id`): the queue builds the squash body from the commit messages.
18+
5. Merge only when the user explicitly asks and the conditions below hold: `gh pr merge <pr> --squash`, without `--delete-branch` or `--body-file`. On a base branch with a merge queue this adds the PR to the queue instead. When the PR fixes an issue someone else reported, credit that reporter with a `Co-authored-by` trailer on one of the PR's commits before merging, using their noreply address `<id>+<login>@users.noreply.github.com` (`gh api users/<login> --jq .id`): the squash body is built from the commit messages.
1919
6. After merging, reply on each linked issue and on any original contributor PR it superseded. For a branch offered without a PR, reply where it was offered. Say what landed and in which PR, and, when it changes the published package, the release that shipped it or that it ships with the next one. Do this in particular when someone pinged or offered a branch and got no answer.
2020

2121
## Ready means

0 commit comments

Comments
 (0)