Skip to content

Merge 4.1 into 4.2 #2834

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 1 commit into from
Apr 9, 2024
Merged

Merge 4.1 into 4.2 #2834

merged 1 commit into from
Apr 9, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 4.1 into 4.2.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge 4.2

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to 4.2 and manually merge using the `ours` merge strategy:
git reset --hard 4.2
git merge --strategy=ours 4.1

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

Adds a usage example page demonstrating how to delete one document from a collection
---------

Co-authored-by: norareidy <norareidy@users.noreply.github.com>
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner April 8, 2024 20:42
@mongodb-php-bot mongodb-php-bot requested a review from GromNaN April 8, 2024 20:42
@GromNaN GromNaN merged commit d51a3a1 into 4.2 Apr 9, 2024
@GromNaN GromNaN deleted the merge-4.1-into-4.2-1712608948373 branch April 9, 2024 13:56
@GromNaN GromNaN mentioned this pull request Apr 9, 2024
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.

3 participants