Skip to content

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 4.9 into 5.0.

Commits

Resolving conflicts

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

Ignoring changes

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

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

@stephmarie17
Copy link
Collaborator

This PR only applies to v4.XX.

auto-merge was automatically disabled April 16, 2025 17:04

Pull request was closed

@GromNaN GromNaN deleted the merge-4.9-into-5.0-1744822986672 branch April 16, 2025 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants