Skip to content

Commit c47d502

Browse files
adinauerclaude
andcommitted
docs: Add merge commit reminder to stack PR descriptions
Stack PRs must be merged with merge commits, not squash. Add a reminder to the PR description so reviewers/mergers pick the right method. This only applies to stack PRs — not standalone PRs or the collection branch PR. Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 51e19ab commit c47d502

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

.claude/skills/create-java-pr/SKILL.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ Fill in each section based on the changes being PR'd. Check any checklist items
113113
- Pass `--base <previous-stack-branch>` so the PR targets the previous branch (first PR in a stack targets the collection branch).
114114
- Use the stacked PR title format: `<type>(<scope>): [<Topic> <N>] <Subject>` (see `.cursor/rules/pr.mdc` § "PR Title Naming").
115115
- Include the stack list at the top of the PR body, before the `## :scroll: Description` section (see `.cursor/rules/pr.mdc` § "Stack List in PR Description" for the format).
116+
- Add a merge method reminder at the very end of the PR body (see `.cursor/rules/pr.mdc` § "Stack List in PR Description" for the exact text). This only applies to stack PRs, not the collection branch PR.
116117

117118
Then continue to Step 5.5 (stacked PRs only) or Step 6.
118119

.cursor/rules/pr.mdc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,14 @@ Format:
215215

216216
No status column — GitHub already shows that. The `---` separates the stack list from the rest of the PR description.
217217

218+
**Merge method reminder:** On stack PRs (not the collection branch PR), add the following line at the very end of the PR description:
219+
220+
```markdown
221+
> ⚠️ **Merge this PR using a merge commit** (not squash). Only the collection branch is squash-merged into main.
222+
```
223+
224+
This does not apply to standalone PRs or the collection branch PR.
225+
218226
To update the PR description, use `--body-file` to avoid shell quoting issues with special characters in the body:
219227

220228
```bash

0 commit comments

Comments
 (0)