Merge release/2.1 back to main after releasing v2.1.1 #17066
Merged
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
--------- Co-authored-by: Venkatesan R <[email protected]>
|
This pull request has merge conflicts. Please resolve those before requesting a review. |
|
@sebastienros please merge this PR using "Create Merge Commit". After merging it, please restore this branch. |
|
What is nice is that we can create this PR, review and do changes, but them merge manually to create a merge commit and GH will assign/close this PR. So no need to change the GH settings. |
sebastienros
force-pushed
the
release/2.1
branch
from
f4d2c14
to
adb5ce9
Compare
|
This pull request has merge conflicts. Please resolve those before requesting a review. |
|
And, just so there is some written trace for our future selves, we should not resolve the conflicts in GH PRs because it merges the target branch (main) into the working one (release/2.1) and that's a problem. |
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.
No description provided.