docs: add merge strategy guidance for signed commits#9
Merged
Conversation
Explains the conflict between `required_signatures` and `required_linear_history` branch protection settings, and documents the recommended workflow: - Rebase locally (developer signs commits) - Merge via merge commit (GitHub signs merge commit) Includes: - Quick reference in SKILL.md - Detailed reference file with API commands - Auto-merge compatibility matrix - Troubleshooting guide
CybotTM
added a commit
that referenced
this pull request
May 5, 2026
GH-3 (SECURITY.md), GH-4 (CONTRIBUTING.md), GH-7 (PR template) declare org_provides: paths so the runner falls back to `gh api repos/{owner}/.github/contents/<path>` when the local file is missing. Repos that opt into org-wide community-health files (the documented GitHub default) now stop being flagged. GH-7 also accepts both PULL_REQUEST_TEMPLATE.md and the lowercase pull_request_template.md (which is what netresearch/.github actually uses) — GitHub treats these case-insensitively. GH-5 (CODEOWNERS) intentionally stays local-only — GitHub's review routing only honours CODEOWNERS in the consuming repo, not the org's .github fallback. GH-8 / GH-9 (issue templates) declare org_provides for completeness but most orgs don't ship default issue templates; for those repos this still surfaces as a finding. When an org does provide them at {owner}/.github/.github/ISSUE_TEMPLATE/<name>, the checkpoint passes. Signed-off-by: Sebastian Mendel <github@sebastianmendel.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
required_signaturesandrequired_linear_historybranch protection settingsChanges
SKILL.md: Added "Merge Strategy & Signed Commits" section with quick referencereferences/merge-strategy.md: New detailed reference with API commands and troubleshootingContext
Discovered while troubleshooting PR merge failures in go-cron repo. The settings
required_linear_history: true+required_signatures: trueare incompatible because GitHub cannot sign commits during rebase merge.Test plan