Skip to content

fix: update repository and merge queue settings#8

Merged
CybotTM merged 1 commit into
mainfrom
fix/merge-queue-and-repo-settings
Jan 10, 2026
Merged

fix: update repository and merge queue settings#8
CybotTM merged 1 commit into
mainfrom
fix/merge-queue-and-repo-settings

Conversation

@CybotTM

@CybotTM CybotTM commented Jan 10, 2026

Copy link
Copy Markdown
Member

Summary

Add comprehensive repository settings documentation and update verification script.

Changes

README.md - New Repository Settings Section

Setting Value Rationale
Allow merge commits With PR title and description
Allow squash merging Preserve commit granularity
Allow rebase merging Use merge queue instead
Automatically delete head branches Keep repo clean
Allow auto-merge Enable merge queue integration
Always suggest updating PR branches Keep PRs up-to-date
Discussions Community Q&A
Wikis Use docs folder instead

Also documents:

  • CLI commands to configure all settings
  • Warning about required_linear_history conflicting with merge commits

Verification Script Updates

Added checks for:

  • Auto-merge enabled
  • Always suggest updating PR branches
  • Discussions enabled
  • Wiki disabled
  • Updated Branch Protection Readiness section to mention merge queue

Test plan

  • README.md has new Repository Settings section
  • CLI commands for all settings documented
  • Warning about required_linear_history added
  • Verification script checks all new settings

@CybotTM CybotTM force-pushed the fix/merge-queue-and-repo-settings branch 2 times, most recently from 188e523 to e011979 Compare January 10, 2026 09:03
Add Repository Settings section with:
- Allow merge commits: enabled (with PR title and description)
- Allow squash/rebase: disabled
- Auto-merge: enabled
- Always suggest updating PR branches: enabled
- Discussions: enabled
- Wikis: disabled

Document that required_linear_history conflicts with merge commits.
Update verification script to check all new settings.
@CybotTM CybotTM force-pushed the fix/merge-queue-and-repo-settings branch from e011979 to ffa24c6 Compare January 10, 2026 09:07
@CybotTM CybotTM merged commit 10e1a08 into main Jan 10, 2026
2 checks passed
@CybotTM CybotTM deleted the fix/merge-queue-and-repo-settings branch January 10, 2026 09:20
CybotTM added a commit that referenced this pull request Apr 24, 2026
fix(checkpoints): GH-8/09 .yml form templates + GH-19/20 reusable workflow
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