Skip to content

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v2.1 into v2.x.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge v2.x

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:
git reset --hard v2.x
git merge --strategy=ours v2.1

Then, push the temporary branch to upate the pull request.

alcaeus and others added 4 commits October 7, 2025 10:37
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
@mongodb-php-bot mongodb-php-bot merged commit 6dbe9d7 into v2.x Oct 7, 2025
132 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v2.1-into-v2.x-1759848868762 branch October 7, 2025 15:16
@codecov-commenter
Copy link

❌ 1 Tests Failed:

Tests completed Failed Passed Skipped
4006 1 4005 422
View the top 1 failed test(s) by shortest run time
::tests/manager/manager-executeCommand_error-003.phpt (MongoDB\Driver\Manager::executeCommand() connection error)
Stack Traces | 0.0187s run time
001- OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException
002- No suitable servers found (`serverSelectionTryOnce` set): %s
003- ===DONE===
001+ .../src/mongoc/mongoc-rpc.c:429 mcd_rpc_message_ingress(): Unreachable code reached: unexpected OP_QUERY ingress
002+ Aborted
003+ 
004+ Termsig=6

To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants