Skip to content

Conversation

@mongodb-php-bot
Copy link
Collaborator

Merge new changes from 5.5 into 5.x.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge 5.x -m "Resolve conflicts in 5.x"

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to 5.x and manually merge using the `ours` merge strategy:
git reset --hard 5.x
git merge --strategy=ours 5.5 -m "Ignore changes from 5.5"

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

1) MongoDB\Laravel\Tests\SchemaTest::testGetTables
Failed asserting that 40960 matches expected 8192.
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner December 9, 2025 08:26
@alcaeus alcaeus removed the request for review from GromNaN December 9, 2025 08:27
@mongodb-php-bot mongodb-php-bot merged commit 0aed655 into 5.x Dec 9, 2025
58 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.5-into-5.x-1765268769967 branch December 9, 2025 08:28
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