Skip to content

read operations reorg for v5.x #3294

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 3, 2025
Merged

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 5.1 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.1

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

* DOCSP-35945: read operations reorg

* skip

* small fixes

* small fixes

* fixes - RM and moved a section
@rustagir rustagir changed the title Merge 5.1 into 5.x read operations reorg for v5.x Feb 28, 2025
@mongodb-php-bot mongodb-php-bot merged commit adc10d4 into 5.x Mar 3, 2025
86 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.1-into-5.x-1740757420887 branch March 3, 2025 15:37
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.

2 participants