Skip to content

chore(renovate): rebase only when conflicted - #78

Merged
jamesarich merged 1 commit into
mainfrom
renovate-rebase-conflicted
Oct 31, 2026
Merged

jamesarich merged 1 commit into
mainfrom
renovate-rebase-conflicted

Conversation

@jamesarich

@jamesarich jamesarich commented Oct 31, 2026 •

Copy link
Copy Markdown
Collaborator

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 dependency update pull requests are now configured to rebase when conflicts occur. This may refresh conflicted update requests against the latest changes, while leaving requests without conflicts unaffected.

@coderabbitai

coderabbitai Bot commented Oct 31, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

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: 3bbb2b30-927d-4685-91e0-795906d4ae11
Commits

Reviewing files that changed from the base of the PR and between 05b7cc2 and c19d6a6.

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

The Renovate configuration now sets rebaseWhen to conflicted.

Changes: Renovate configuration

Layer / File(s) Summary
Set the rebase condition
renovate.json
The configuration sets rebaseWhen to conflicted.

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

Change: Other

Merge Risk: Minimal · up to c19d6

The configuration limits automatic rebasing to conflicted branches. No actionable merge-blocking issue is identified; this is ready to merge after normal configuration checks.

Pre-merge checks: Passed 5
Check name Status Explanation
Description Check Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check Passed The title clearly and concisely describes the main change: Renovate will rebase only when conflicts exist.
Docstring Coverage Passed 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 Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed 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

A rabbit checks the config at dawn
“Rebase when conflicts are drawn!”
It nibbles a leaf beside the file
Then hops through the fields with a smile
One setting added, and off it is gone

@jamesarich
jamesarich enabled auto-merge October 31, 2026 13:37
@jamesarich
jamesarich added this pull request to the merge queue Oct 31, 2026
Merged via the queue into main with commit 2452313 Oct 31, 2026
10 checks passed
@jamesarich
jamesarich deleted the renovate-rebase-conflicted branch October 31, 2026 13:50
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.

1 participant