Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merge 5.2 into 5.x #3311

Merged
merged 1 commit into from
Mar 6, 2025
Merged

Merge 5.2 into 5.x #3311

merged 1 commit into from
Mar 6, 2025

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-47950: Fix all operator section

* review feedback
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner March 6, 2025 15:39
@mongodb-php-bot mongodb-php-bot requested a review from rustagir March 6, 2025 15:39
@github-actions github-actions bot added the docs label Mar 6, 2025
@mongodb-php-bot mongodb-php-bot merged commit 6129709 into 5.x Mar 6, 2025
183 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.2-into-5.x-1741275545761 branch March 6, 2025 15:40
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants