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.
As is, we have 8+ renovate pull requests for updating patch dependencies.
The
Require branches to be up to date before merging
formain
results in a high maintenance burden and context-switching workflow as you need to wait for all the CI tests to pass and the branch to rebase each time you want to merge.The new suggested strategy is to merge all passing renovate pull requests to a
renovating
branch, and at our discretion merge thatrenovating
branch back tomain
on a periodical basis, verifying that therenovating->main
pull request is additionally passing.This allows us to side-step problematic renovate pull requests such as the #6810 which has some long-term baggage in respect to problematic dependency resolutions, or things like #6769 where
eslint
8 has a bug that is preventing us from merging that at this time.edit: we had to rename
renovate
torenovating
,git
does not support sub-branches (that is, you can't haverenovate
andrenovate/foo
, which @renovate-bot automatically creates)