Only rebase Renovate PRs when they conflict - #437
Merged
Conversation
Copilot created this pull request from a session on behalf of
lalten
August 2, 2026 09:13
View session
lalten
marked this pull request as ready for review
August 2, 2026 09:13
lalten
enabled auto-merge (squash)
August 2, 2026 09:13
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the repository’s Renovate configuration to reduce unnecessary CI churn by preventing automatic rebases of dependency update PRs unless they actually conflict with the base branch.
Changes:
- Set Renovate
rebaseWhento"conflicted"so open PR branches are only rebased when required to resolve merge conflicts.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Renovate's default
rebaseWhen: "auto"rebases every open PR as soon as anything lands onmain, kicking off a full CI matrix per PR each time. With a large batch of open dependency PRs — many of which are intentionally left sitting — this is a lot of wasted CI.Changes
renovate.json: setrebaseWhen: "conflicted", so a branch is only rebased when it actually conflicts with the base branch.Trade-off
PR branches are now validated against a potentially older base. This means GitHub's "require branches to be up to date before merging" branch protection setting should stay off; otherwise merges will block on manual rebases. A rebase can still be triggered on demand via the PR's rebase checkbox or the dependency dashboard.
This is the narrow, single-knob version of the fix. Complementary options not included here: a
concurrencyblock inci.yamlto cancel superseded PR runs,prConcurrentLimit/prHourlyLimit, andpackageRulessplitting dev/lint deps (automerge) from consumer-visiblebazel_deps (dashboard-approved).