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 requested a review from a team as a code owner December 8, 2025 14:03
@GromNaN
Copy link
Member

GromNaN commented Dec 8, 2025

Fix random CI failure: #3464

@GromNaN
Copy link
Member

GromNaN commented Dec 8, 2025

Superseded by #3465

@GromNaN GromNaN closed this Dec 8, 2025
auto-merge was automatically disabled December 8, 2025 17:30

Pull request was closed

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.

4 participants