Skip to content

fix: persist delete_branch_on_merge in settings.yml - #200

Closed
don-petry wants to merge 3 commits into
mainfrom
claude/issue-164-20260418-1849
Closed

don-petry wants to merge 3 commits into
mainfrom
claude/issue-164-20260418-1849

Conversation

@don-petry

Copy link
Copy Markdown
Collaborator

Summary

  • Adds delete_branch_on_merge: true to .github/settings.yml under a repository: section
  • Ensures probot/settings declaratively manages this setting so it cannot be inadvertently reset
  • The GitHub API already returns true for this setting (likely set manually), but without the config file entry it is unmanaged

Why

The weekly compliance audit (#164) checks that delete_branch_on_merge is true per the org standard. Persisting the value in settings.yml means probot/settings will enforce it on every run, making the compliance state durable.

Note on PR #184

PR #184 contains the same fix on a different branch. This PR supersedes it; #184 should be closed once this one merges.

Closes #164

Generated with Claude Code

Add `delete_branch_on_merge: true` to the probot/settings configuration
so that the compliance setting is maintained declaratively and cannot
be inadvertently reset by a future probot/settings run.

Closes #164

Co-authored-by: don-petry <don-petry@users.noreply.github.com>
Copilot AI review requested due to automatic review settings April 18, 2026 18:51
@coderabbitai

coderabbitai Bot commented Apr 18, 2026

Copy link
Copy Markdown

Warning

Rate limit exceeded

@github-actions[bot] has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 56 minutes and 11 seconds before requesting another review.

Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 56 minutes and 11 seconds.

⌛ How to resolve this issue?

After the wait time has elapsed, 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 have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: e36900b0-c880-4096-a086-255c6b190e2b

📥 Commits

Reviewing files that changed from the base of the PR and between 56ee75a and 730b99c.

📒 Files selected for processing (1)
  • .github/settings.yml
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch claude/issue-164-20260418-1849

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

Copy link
Copy Markdown
Collaborator Author

Self-review

Change: Add delete_branch_on_merge: true to .github/settings.yml under a repository: section.

Checklist:

  • Correct probot/settings key (delete_branch_on_merge) and value (true)
  • Placed under the repository: top-level key as required by the probot/settings schema
  • Comment references the org standard for traceability
  • YAML is syntactically valid
  • No other settings in the file are affected
  • No code changes → no tests needed; this is a declarative config file

No issues found. The change is minimal, correct, and consistent with the org standard.


Also closing the superseded PR #184, which contains the same change on a different branch.

@don-petry

Copy link
Copy Markdown
Collaborator Author

@don-petry — PR ready for review. This adds delete_branch_on_merge: true to .github/settings.yml to persist the compliance setting declaratively. Self-review complete; no issues found. PR #184 (previous attempt) is superseded by this one.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Adds a declarative repository setting to ensure delete_branch_on_merge remains enabled via probot/settings, aligning the repo with the org compliance standard noted in #164.

Changes:

  • Introduces a repository: section in .github/settings.yml
  • Persists delete_branch_on_merge: true so probot/settings enforces it on every run

Comment thread .github/settings.yml
Comment on lines +4 to +7
repository:
# Automatically delete head branches after a pull request is merged
# Reference: https://github.com/petry-projects/.github/blob/main/standards/github-settings.md#repository-settings--standard-defaults
delete_branch_on_merge: true

Copilot AI Apr 18, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this file already defines other top-level probot/settings keys (e.g., existing repository settings elsewhere in the file), introducing a second repository: block would cause YAML key overwrites and only the last block would take effect. Ensure there is only a single top-level repository: mapping and merge this setting into it if one already exists.

Copilot uses AI. Check for mistakes.
@sonarqubecloud

Copy link
Copy Markdown

@don-petry

Copy link
Copy Markdown
Collaborator Author

Closing as duplicate of #217 — same fix for issue #184. The newest attempt is kept open.

@don-petry don-petry closed this May 3, 2026
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.

Compliance: delete_branch_on_merge

2 participants