Merge v1.21 into v2.3 - #1962
Merged
Merged
Conversation
Enable 2 new features when creating merge-up PR: - Add "merge-up" label - Assign the approver of the merged pull request Backport rector fixes and drivers-evergreen-tools update in order to make the CI pass
|
There is an existing patch(es) for this commit SHA: Please note that the status that is posted is not in the context of this PR but rather the (latest) existing patch and that may affect some tests that may depend on the particular PR. If your tests do not rely on any PR-specific values (like base or head branch name) then your tests will report the same status. If you would like a patch to run in the context of this PR and abort the other(s), comment 'evergreen retry'. |
mongodb-php-bot
enabled auto-merge
August 18, 2026 14:10
![semgrep-code-mongodb[bot]](https://avatars.githubusercontent.com/u/45120?s=60&v=4){kind=small}
GromNaN
approved these changes
Aug 18, 2026
❌ 38 Tests Failed:
View the full list of 41 ❄️ flaky test(s)
To view more test analytics, go to the Test Analytics Dashboard |
GromNaN
force-pushed
the
merge-v1.21-into-v2.3-1787062213200
branch
2 times, most recently
from
August 19, 2026 14:26
a9773ca to
ac3ae69
Compare
# Conflicts: # .github/workflows/merge-up.yml # rector.php # tests/Model/IndexInfoFunctionalTest.php
GromNaN
force-pushed
the
merge-v1.21-into-v2.3-1787062213200
branch
from
August 19, 2026 14:39
ac3ae69 to
29ce890
Compare
This was referenced Aug 20, 2026
Merged
Merged
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
4 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.
Merge new changes from v1.21 into v2.3.
Commits
To resolve any conflicts, check out the temporary branch and run the following command:Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to v2.3 and manually merge using the `ours` merge strategy:Ignoring changes
Then, push the temporary branch to update the pull request.