Skip to content

fix: enable delete_branch_on_merge and align merge settings with org standards - #140

Merged
don-petry merged 27 commits into
mainfrom
claude/issue-106-20260418-1853
May 19, 2026
Merged

don-petry merged 27 commits into
mainfrom
claude/issue-106-20260418-1853

Conversation

@don-petry

Copy link
Copy Markdown
Contributor

Summary

  • Adds delete_branch_on_merge: true to .github/settings.yml so merged branches are automatically deleted — resolving the compliance finding
  • Also aligns the remaining merge settings (allow_squash_merge, allow_merge_commit, allow_rebase_merge, allow_auto_merge, squash_merge_commit_title, squash_merge_commit_message) with the org standard

When this PR is merged, the probot/settings app will apply these settings to the repository automatically.

Closes #106

Generated with Claude Code

…standards

Add delete_branch_on_merge: true and related merge settings to
.github/settings.yml so probot/settings applies them when this PR
is merged, resolving the compliance finding for issue #106.

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

coderabbitai Bot commented Apr 18, 2026 •

Copy link
Copy Markdown

Warning

Rate limit exceeded

@don-petry has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 59 minutes and 14 seconds before requesting another review.

You’ve run out of usage credits. Purchase more in the billing tab.

⌛ 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: e5bc0af8-b345-4dc1-b92a-f674d263092d

📥 Commits

Reviewing files that changed from the base of the PR and between 9ab70bb and 021560e.

📒 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-106-20260418-1853

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.

Copilot AI left a comment

Copy link
Copy Markdown

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.

Updates the repository’s probot/settings configuration to meet compliance and align merge behavior with the organization’s GitHub repository standards.

Changes:

  • Enable automatic deletion of branches after merge (delete_branch_on_merge: true).
  • Align merge strategy toggles and squash commit metadata settings with org defaults.

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

@github-actions
github-actions Bot requested a review from a team as a code owner May 4, 2026 20:36
@don-petry don-petry closed this May 11, 2026
@don-petry don-petry reopened this May 11, 2026
@sonarqubecloud

Copy link
Copy Markdown

@don-petry
don-petry enabled auto-merge (squash) May 12, 2026 01:40

@donpetry-bot donpetry-bot 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.

Automated review — APPROVED ✓

Risk: LOW
Reviewed commit: ba432386ec53ed25b5643129936118ef35780850
Review mode: triage-approved (single reviewer)

Summary

Config-only change to .github/settings.yml that adds delete_branch_on_merge: true (resolving the compliance finding in #106) and aligns the remaining repo merge settings (allow_squash_merge, allow_merge_commit, allow_rebase_merge, allow_auto_merge, squash_merge_commit_title, squash_merge_commit_message) with the petry-projects org standard. Total diff: +7/-0 across a single file. The triage tier already cleared this as low-risk; this confirmation review agrees.

Linked issue analysis

Closes #106 — Compliance: delete_branch_on_merge (severity: warning). The issue requires delete_branch_on_merge: true. The diff adds exactly that, and probot/settings will apply it on merge. Substantively addressed.

Findings

  • Values match the org standard exactly. Cross-checked against standards/github-settings.md#repository-settings--standard-defaults:
    • delete_branch_on_merge: true ✓
    • allow_squash_merge: true ✓
    • allow_merge_commit: true ✓
    • allow_rebase_merge: true ✓
    • allow_auto_merge: true ✓
    • squash_merge_commit_title: PR_TITLE ✓
    • squash_merge_commit_message: COMMIT_MESSAGES ✓
  • No security or behavior risk. The file is consumed by the probot/settings app; no code paths, secrets, workflows, or permissions are touched.
  • No unresolved threads. Copilot left a non-blocking overview comment; no human review questions outstanding.

CI status

All checks green:

  • CodeQL — Analyze (actions): SUCCESS
  • CodeQL — Analyze (go): SUCCESS
  • CodeQL — Analyze (javascript-typescript): SUCCESS
  • CodeQL (rollup): SUCCESS
  • CodeRabbit: SUCCESS
  • SonarQube Cloud quality gate: PASSED (0 new issues, 0 hotspots)

Reviewed automatically by the PR-review agent (single-reviewer mode: opus 4.7). Reply if you need a human review.

@sonarqubecloud

Copy link
Copy Markdown

@don-petry
don-petry merged commit 395664c into main May 19, 2026
18 of 19 checks passed
@don-petry
don-petry deleted the claude/issue-106-20260418-1853 branch May 19, 2026 10:25
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

3 participants