chore(renovate): set rebaseWhen to conflicted to improve merge-queue compatibility #4730
Conversation
This file contains 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
pichlermarc
changed the title
dyladan
approved these changes
May 24, 2024
|
Will this work? I think our policy requires pull requests to be up to date before merging. Will the merge queues automatically handle that in the no-conflict case? |
pichlermarc
changed the title
I think this should work fine. I've tried using the merge queue with PRs that were not up-to-date and I was able to merge them. My guess is that the merge-queue somehow overrides this setting. |
Merged
via the queue into
open-telemetry:main
with commit May 27, 2024
969a16f
19 of 20 checks passed
Zirak
pushed a commit
to Zirak/opentelemetry-js
that referenced
this pull request
Sep 14, 2024
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 force-pushes due to the rebaseWhen config, which is set to auto. That means it'll try to rebase once it's behind the base-branch, and that breaks the queue as there was a force-push to the branch while the PR was in the queue.
With
conflictedit only does that when there'd be a conflict when merging to main (in that case it'd be fine as the queue would break anyway if I understand the merge-queue concept correctly).