Keep Renovate PRs rebased and tolerate auto-fix commits#415
Merged
Conversation
Two related Renovate config additions to make stacked Renovate PRs self-resolve instead of piling up red after one of them merges: * `rebaseWhen: behind-base-branch` — Renovate proactively regenerates every PR that is behind main on its next run, instead of waiting for a hard conflict to be detected. * `gitIgnoredAuthors` — by default Renovate refuses to touch a PR branch whose history contains commits from a non-Renovate author, which would freeze every PR after the first auto-fix commit from the update-vendor-hash workflow. Add the `github-actions[bot]` identity that workflow commits under so Renovate keeps regenerating those branches; the workflow then re-runs on the force-push and recomputes the correct vendorHash for the new dep state.
jupblb
force-pushed
the
michal/renovate-rebase-config
branch
from
172c8e3 to
96942f5
Compare
trly
approved these changes
May 14, 2026
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
2 participants
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.
No description provided.