Skip to content

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.

* DOCSP-35966: Query builder docs standardization
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner April 8, 2024 13:46
@mongodb-php-bot mongodb-php-bot requested a review from GromNaN April 8, 2024 13:46
@GromNaN GromNaN merged commit 90274b8 into 4.2 Apr 8, 2024
@GromNaN GromNaN deleted the merge-4.1-into-4.2-1712583963596 branch April 8, 2024 14:37
This was referenced Apr 8, 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.

2 participants