[jamesarich]

Renovate's default rebases every open PR after each merge, which burns the org's 20 hosted jobs. rebaseWhen: conflicted rebases only on a real conflict. The merge queue keeps branches current.

Summary by CodeRabbit

• Chores
  • Automated update requests now rebase when conflicts arise, helping keep them current with the latest changes. No user-facing features or behavior changed.

[coderabbitai]

No actionable comments were generated in the recent review.

Recent review info

Run configuration

• Source mode: Auto
• Repository: Unavailable
• Branch: Unavailable
• File: No configuration file from this repository applied
• Commit: Unavailable
• Layers: Organization UI
• Review profile: CHILL
• Plan: Advanced
• Run ID: b00e9203-5891-4b5b-9934-8362c826f012

Commits

Reviewing files that changed from the base of the PR and between e75ad3f and 6b9daca.

Files selected for processing: 1

• renovate.json

Included review availability: This review used your included allowance. Your plan provides up to 1 included review per hour; 0 remain after this review.

Walkthrough

Renovate configuration now sets rebaseWhen to conflicted, so Renovate rebases updates when they are conflicted.

Changes: Renovate configuration

Layer / File(s)	Summary
Configure conflict rebasing renovate.json	Sets rebaseWhen to conflicted.

Estimated code review effort: 1 (Trivial) | ~3 minutes

Change: Other

Merge Risk: Minimal · up to 6b9da

This configuration change is narrowly scoped and introduces no identified merge-blocking risk.

Pre-merge checks: 5

Check name	Status	Explanation
Description Check		Check skipped - CodeRabbit’s high-level summary is enabled.
Title check		The title clearly and concisely describes the main change: configuring Renovate to rebase only when conflicts occur.
Docstring Coverage		No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentat…
Linked Issues check		Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check		Check skipped because no linked issues were found for this pull request.

Full details: Docstring Coverage

Explanation

No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentation-only edits and deletions within surviving functions are included; unchanged diff context and fully deleted functions are excluded. Analyzed 0 functions across 0 files. (1 skipped: 1 unsupported.)

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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

• X
• Mastodon
• Reddit
• LinkedIn

_{A rabbit checks the update trail,
“Conflicts arise,” it twitches its tail.
Renovate rebases when they appear,
The path is set in config here.
Then off hops the rabbit, bright and clear.}