From 8d446794ca2e782eb26b814bc4d7a1dd1ad2deb3 Mon Sep 17 00:00:00 2001 From: Ramon Roche Date: Sun, 27 Sep 2026 15:27:20 -0700 Subject: [PATCH] docs(skills): say PRs may be squashed at maintainer discretion (#28871) The pr and commit skills claimed every PR is squash-merged, which contradicts CONTRIBUTING.md: merge strategy is case by case, with both squash and rebase merges enabled. The wrong claim led to fix-up commits being kept on branches on the assumption they would be squashed away. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Ramon Roche --- .agents/skills/commit/SKILL.md | 4 +--- .agents/skills/pr/SKILL.md | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.agents/skills/commit/SKILL.md b/.agents/skills/commit/SKILL.md index 5d9923b5eed..32e81bf21e7 100644 --- a/.agents/skills/commit/SKILL.md +++ b/.agents/skills/commit/SKILL.md @@ -36,9 +36,7 @@ invent one.** is the user's DCO certification of changes they have reviewed: never commit with `-s` work the user has not seen. 6. Add new commits rather than amending pushed ones, and never force-push - unless the user asks or the branch is being rebased. PRs are squash-merged, - so the branch history costs nothing on `main` and shows reviewers the - decision chain. + unless the user asks or the branch is being rebased. 7. If the branch has an upstream (`git rev-parse --abbrev-ref @{u}`), push. 8. If the branch has an open PR (`gh pr view --json state,body`), update its description with `gh pr edit --body` when the commit changes what the diff --git a/.agents/skills/pr/SKILL.md b/.agents/skills/pr/SKILL.md index 96de3e016d6..967066ab1e6 100644 --- a/.agents/skills/pr/SKILL.md +++ b/.agents/skills/pr/SKILL.md @@ -23,8 +23,8 @@ footers. Disclose AI assistance as the last line of the PR body, italicized: bumps, docs, ROMFS). Build with the `build-px4-linux` or `build-px4-macos` skill. Fix any build errors before opening the PR. 4. PR **title:** `type(scope): description` — under 72 chars, covers the - overall change across all commits. This becomes the squash-merge commit - message. + overall change across all commits. If a maintainer squash-merges the PR, + this becomes the commit message. 5. PR **body:** as short as it can be while still landing the point — a reviewer should take it in at a glance, and a long description is one nobody reads. Sections, in order: `## Summary`, `## Problem`,