Skip to content

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 5.5 into 5.x.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge 5.x -m "Resolve conflicts in 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.5 -m "Ignore changes from 5.5"

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

@mongodb-php-bot mongodb-php-bot merged commit d9b27aa into 5.x Sep 22, 2025
142 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.5-into-5.x-1757954317621 branch September 22, 2025 08:37
@GromNaN GromNaN requested review from GromNaN and removed request for alcaeus September 22, 2025 08:37
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