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 <mrpollo@gmail.com>
This commit is contained in:
Ramon Roche authored and GitHub committed 2026-09-27 16:27:20 -06:00
1 parent 4ce66eb466
commit 8d446794ca
2 files changed
+3 -5

No files matched your search

+1 -3
View File
@@ -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
+2 -2
View File
@@ -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`,