Skip to content

Conversation

@mongodb-php-bot
Copy link
Collaborator

Merge new changes from 5.2 into 5.x.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge 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.2

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

* DOCSP-48018: laravel 12 feature compat

* small fixes

* JT fix
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner March 5, 2025 16:09
@mongodb-php-bot mongodb-php-bot requested a review from rustagir March 5, 2025 16:09
@github-actions github-actions bot added the docs label Mar 5, 2025
@mongodb-php-bot mongodb-php-bot merged commit 22d28b0 into 5.x Mar 5, 2025
183 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.2-into-5.x-1741190982838 branch March 5, 2025 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants