Merge 5.2 into 5.x #3302

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

Jump to bottom

Closed

mongodb-php-bot wants to merge 1 commit into 5.x from merge-5.2-into-5.x-1741103812546

Closed

Merge 5.2 into 5.x #3302

mongodb-php-bot wants to merge 1 commit into 5.x from merge-5.2-into-5.x-1741103812546

Conversation

@mongodb-php-bot

Copy link

Collaborator

@mongodb-php-bot mongodb-php-bot commented Mar 4, 2025

Merge new changes from 5.2 into 5.x.

Commits

Merges the read operation reorganization into 5.2 (Merges the read operation reorganization into 5.2 #3301 ): f06d944

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.

@rustagir @mongodb-php-bot @alcaeus


 Merges the read operation reorganization into 5.2 ( #3301 )

f06d944

* DOCSP-35945: read operations reorg (#3293)
* DOCSP-35945: read operations reorg
* skip
* small fixes
* small fixes
* fixes - RM and moved a section
* link fic
* Fix releasing from development branch (#3299)
---------
Co-authored-by: MongoDB PHP Bot <162451593+mongodb-php-bot@users.noreply.github.com>
Co-authored-by: Andreas Braun <andreas.braun@mongodb.com>