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.

@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner April 10, 2024 11:26
@mongodb-php-bot mongodb-php-bot requested a review from GromNaN April 10, 2024 11:26
@alcaeus alcaeus enabled auto-merge April 10, 2024 11:30
@alcaeus alcaeus merged commit c114e00 into 4.2 Apr 10, 2024
@alcaeus alcaeus deleted the merge-4.1-into-4.2-1712748400072 branch April 10, 2024 11:30
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