Skip to content

fix: align verify script with README merge strategy#7

Merged
CybotTM merged 1 commit into
mainfrom
fix/verify-script-merge-method
Jan 3, 2026
Merged

fix: align verify script with README merge strategy#7
CybotTM merged 1 commit into
mainfrom
fix/verify-script-merge-method

Conversation

@CybotTM

@CybotTM CybotTM commented Jan 3, 2026

Copy link
Copy Markdown
Member

Summary

The verify script was checking for rebase-only configuration while the README recommends merge-commits-only. This inconsistency caused repos configured per README to be flagged as incorrect.

Changes

  • Check for merge commits enabled (not rebase)
  • Check for rebase disabled (not enabled)
  • Update info messages to reflect merge-commits-only strategy
  • Add comment explaining the rationale

Rationale

Merge commits with strict: true branch protection provides:

  • Clean history: PRs are rebased before merge (strict mode)
  • Visible integration points: Merge commits mark PR boundaries
  • Preserved commit granularity: Individual commits kept (vs squash)

The verify script was checking for rebase-only configuration while the
README recommends merge-commits-only. This inconsistency caused confusion
when the script reported failures for correctly configured repositories.

Changes:
- Check for merge commits enabled (not rebase)
- Check for rebase disabled (not enabled)
- Update info messages to reflect merge-commits-only strategy
- Add comment explaining the rationale (merge commits preserve history,
  strict branch protection ensures rebased PRs)
@CybotTM CybotTM merged commit d5ec11d into main Jan 3, 2026
1 check passed
@CybotTM CybotTM deleted the fix/verify-script-merge-method branch January 3, 2026 10:44
CybotTM added a commit that referenced this pull request May 5, 2026
- GH-7: add docs/ paths to target list and accept both upper/lowercase
  PULL_REQUEST_TEMPLATE.md in org_provides via brace expansion.
- GH-8/09: drop redundant .github/ prefix from org_provides (path is
  resolved against the {owner}/.github repo root) and accept both .yml
  and .md forms for the org-wide fallback so repos following either
  Netresearch convention pass.
- GH-32: align prompt with GH-30 demote — enforce_admins is advisory
  (info), only required_conversation_resolution remains error-level.
  Prevents repos following the org default (enforce_admins=false) from
  failing GH-32 even though GH-30 was demoted to info.

Signed-off-by: Sebastian Mendel <github@sebastianmendel.de>
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>
CybotTM added a commit that referenced this pull request May 5, 2026
- GH-7: add docs/ paths to target list and accept both upper/lowercase
  PULL_REQUEST_TEMPLATE.md in org_provides via brace expansion.
- GH-8/09: drop redundant .github/ prefix from org_provides (path is
  resolved against the {owner}/.github repo root) and accept both .yml
  and .md forms for the org-wide fallback so repos following either
  Netresearch convention pass.
- GH-32: align prompt with GH-30 demote — enforce_admins is advisory
  (info), only required_conversation_resolution remains error-level.
  Prevents repos following the org default (enforce_admins=false) from
  failing GH-32 even though GH-30 was demoted to info.

Signed-off-by: Sebastian Mendel <github@sebastianmendel.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant