Skip to content

fix: enable delete_branch_on_merge to comply with org standards - #147

Closed
don-petry wants to merge 48 commits into
mainfrom
claude/issue-106-20260420-0332
Closed

don-petry wants to merge 48 commits into
mainfrom
claude/issue-106-20260420-0332

Conversation

@don-petry

Copy link
Copy Markdown
Contributor

Summary

  • Adds delete_branch_on_merge: true to .github/settings.yml to resolve the compliance finding from issue Compliance: delete_branch_on_merge #106
  • Adds the full set of standard merge settings per petry-projects org standards:
    • allow_squash_merge: true — primary merge method
    • allow_merge_commit: true — enabled to allow admin overrides
    • allow_rebase_merge: true — enabled to allow admin overrides
    • allow_auto_merge: true — required for Dependabot auto-merge workflow
    • squash_merge_commit_title: PR_TITLE — clean commit history
    • squash_merge_commit_message: COMMIT_MESSAGES — preserves individual commit messages
  • The probot/settings app will apply these settings when this PR is merged

Test plan

  • Merge this PR — probot/settings applies the config
  • Verify delete_branch_on_merge is enabled in repo settings after merge
  • Confirm the next weekly compliance audit marks Compliance: delete_branch_on_merge #106 as resolved

Closes #106

Generated with Claude Code

Adds all standard merge settings to .github/settings.yml per org standards:
- delete_branch_on_merge: true (resolves compliance finding)
- allow_squash_merge, allow_merge_commit, allow_rebase_merge: true
- allow_auto_merge: true (required for Dependabot auto-merge)
- squash_merge_commit_title: PR_TITLE
- squash_merge_commit_message: COMMIT_MESSAGES

Closes #106

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

coderabbitai Bot commented Apr 20, 2026 •

Copy link
Copy Markdown

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 58 minutes and 45 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: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 9cfdaf5a-0c65-4fd3-aa74-adbd35e9c6c7

📥 Commits

Reviewing files that changed from the base of the PR and between 61aa4ee and 18c0131.

📒 Files selected for processing (2)
  • .github/settings.yml
  • .gitignore
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch claude/issue-106-20260420-0332

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

Updates the repository’s probot/settings configuration to match petry-projects org merge-setting standards and address compliance issue #106 by ensuring head branches are automatically deleted after merge.

Changes:

  • Adds standard merge settings under repository: (squash/merge-commit/rebase/auto-merge toggles).
  • Enables delete_branch_on_merge: true.
  • Sets squash merge commit title/message behavior (PR_TITLE, COMMIT_MESSAGES).

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

@don-petry

Copy link
Copy Markdown
Contributor Author

Self-review complete

Change summary: Adds 9 lines to .github/settings.yml — all merge settings taken verbatim from the org standards. No logic, no code, no risk.

CI: All checks pass except dependency-audit / pnpm audit, which fails with ERR_PNPM_BROKEN_LOCKFILE on all branches (pre-existing issue unrelated to this PR — the lockfile is unchanged here).

Ready for review. @don-petry — please review and merge to resolve the compliance finding on issue #106.

@don-petry
don-petry enabled auto-merge (squash) April 25, 2026 18:15
@github-actions
github-actions Bot requested a review from a team as a code owner May 4, 2026 20:35
@don-petry don-petry closed this May 11, 2026
@sonarqubecloud

Copy link
Copy Markdown

@don-petry

Copy link
Copy Markdown
Contributor Author

@dev-lead - please fix this PR

@don-petry

Copy link
Copy Markdown
Contributor Author

Dev-Lead — fix-bot-comment (applied)

Changes committed and pushed.

@sonarqubecloud

sonarqubecloud Bot commented Jun 1, 2026

Copy link
Copy Markdown

@don-petry

Copy link
Copy Markdown
Contributor Author

Closing due to merge conflict that cannot be auto-rebased. Re-implementing from fresh main via dev-lead.

@don-petry don-petry closed this Jun 2, 2026
auto-merge was automatically disabled June 2, 2026 12:24

Pull request was closed

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