fix: enable delete_branch_on_merge on .github repo by don-petry · Pull Request #222 · petry-projects/.github

don-petry · 2026-05-08T17:38:52Z

Summary

Applied delete_branch_on_merge=true to the petry-projects/.github repository via the GitHub API to resolve the recurring compliance finding
Updated standards/github-settings.md to remove the stale "all 7 repos fully compliant as of 2026-04-05" claim and record the remediation

How the fix was applied

The repository setting was explicitly set via:

gh api -X PATCH repos/petry-projects/.github -F delete_branch_on_merge=true

The setting returned true — confirmed compliant. The weekly compliance audit will auto-close issue #108 on its next run once it reads the corrected API state.

Why the documentation change

The standards/github-settings.md compliance status section contained a stale claim ("All 7 repos are fully compliant as of 2026-04-05") that was clearly incorrect given the audit has flagged this issue repeatedly since. The updated note records the specific remediation action taken and provides guidance for future drift.

Closes #108

Generated with Claude Code

Summary by CodeRabbit

Documentation
- Updated GitHub settings compliance documentation with current remediation status records.

coderabbitai · 2026-05-08T17:38:59Z

Warning

Review limit reached

@don-petry, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 23 minutes and 18 seconds. Learn how PR review limits work.

Your organization has run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: ASSERTIVE

Plan: Pro

Run ID: fbc00683-6086-497e-8cb6-994eafe17b11

📥 Commits

Reviewing files that changed from the base of the PR and between 8d94bb0 and 5af808a.

📒 Files selected for processing (1)

actionlint

📝 Walkthrough

Walkthrough

The PR updates standards/github-settings.md to replace a blanket compliance statement with a specific remediation entry. The .github repository's delete_branch_on_merge setting was applied on 2026-05-08, and the documentation instructs re-running the settings application script with an admin token to address drift.

Changes

Compliance Status Documentation

Layer / File(s)	Summary
Compliance Status and Remediation Instructions `standards/github-settings.md`	Current Compliance Status section updated to document `delete_branch_on_merge` remediation applied to `.github` repository on 2026-05-08, replacing the prior blanket compliance assertion with specific drift remediation guidance.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Possibly related PRs

petry-projects/.github#10: Introduces the GitHub settings standard that this PR updates with compliance status.
petry-projects/.github#73: Also updates the Current Compliance Status section in the same file with similar remediation scripting references.

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately summarizes the main change: enabling delete_branch_on_merge on the .github repo, which is the primary objective and directly relates to the changeset.
Linked Issues check	✅ Passed	The pull request fully addresses issue `#108` by enabling delete_branch_on_merge=true on the .github repo via GitHub API and updating the compliance documentation.
Out of Scope Changes check	✅ Passed	All changes in the pull request are directly related to fixing the delete_branch_on_merge compliance finding and updating relevant documentation; no out-of-scope changes detected.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch claude/issue-108-20260508-1732

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

don-petry · 2026-05-08T17:39:35Z

@petry-projects/org-leads — this PR is ready for review. It fixes the recurring compliance finding for delete_branch_on_merge on the .github repo (issue #108) by applying the setting via GitHub API and updating the compliance status documentation.

Copilot

Pull request overview

Updates the GitHub settings standards documentation to reflect remediation of the .github repo’s delete_branch_on_merge compliance finding and removes an outdated “fully compliant” status claim.

Changes:

Replaces the stale “All 7 repos are fully compliant as of 2026-04-05” statement with a specific note about applying delete_branch_on_merge to the .github repo on 2026-05-08.
Documents the exact gh api command used and adds guidance to re-apply standard settings via scripts/apply-repo-settings.sh --all when drift is detected.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

The merge-base changed after approval.

github-actions · 2026-05-12T03:02:36Z

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved manually.

Please resolve the conflicts and push:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

donpetry-bot · 2026-05-13T23:56:08Z

Superseded by automated re-review at 3f3284b1e786c628c6473c6ab236636974ea7ef1 — click to expand prior review.

Review — fix requested (cycle 1/3)

The automated review identified the following issues. Please address each one:

Findings to fix

[Findings would be inserted here]

Additional tasks

Resolve all unresolved review thread comments from other reviewers
Ensure all CI checks pass after your changes
Rebase on the target branch if behind
Do NOT modify files unrelated to the findings above

The review cascade will automatically re-review after new commits are pushed.

donpetry-bot

Automated review — APPROVED ✓

Risk: LOW
Reviewed commit: 3f3284b1e786c628c6473c6ab236636974ea7ef1
Cascade: triage → deep (triage: haiku 4.5 → deep: sonnet 4.6 + duck: o4-mini → audit: opus 4.7)

Summary

This is a documentation-only PR whose diff is now empty because the compliance status in standards/github-settings.md was already updated on main (by a subsequent remediation run that set all 7 repos compliant as of 2026-05-13). The actual fix — setting delete_branch_on_merge=true on petry-projects/.github via the GitHub API — was applied correctly and the API returns true; issue #108 was auto-closed by the compliance audit on 2026-05-13. All CI checks are green, merge conflicts are resolved, and merging this PR is a safe no-op.

Findings

INFO: PR has 0 additions and 0 deletions. The documentation change to standards/github-settings.md that this PR originally introduced was superseded by a subsequent update to main (compliance status now reads 'All 7 repos are fully compliant as of 2026-05-13'). Merging this PR will make no file changes.
INFO: Issue #108 was auto-closed by the compliance audit on 2026-05-13 confirming delete_branch_on_merge=true is active. The GitHub API currently returns true for this setting on petry-projects/.github.
INFO: Triage flagged an unresolved merge conflict (auto-rebase failure on 2026-05-12). This was subsequently resolved — mergeable=MERGEABLE as of the current HEAD (3f3284b). Two manual merge-main-into-branch commits were pushed on 2026-05-14.
INFO: The prior review cycle (SHA 3c0a1c0) emitted fix-requested with an unpopulated findings template. No substantive changes have been pushed since that review; the status change (fix-requested → approve) is warranted because CI is now fully green, conflicts are resolved, and the underlying issue is closed.

Reviewed by the PR-review cascade (triage: haiku 4.5 → deep: sonnet 4.6 + duck: o4-mini → audit: opus 4.7). Reply if you need a human review.

donpetry-bot · 2026-06-08T23:42:27Z