Skip to content

Merge v2.2 into v2.x#1944

Merged
mongodb-php-bot merged 1 commit intov2.xfrom
merge-v2.2-into-v2.x-1770973748021
Feb 13, 2026
Merged

Merge v2.2 into v2.x#1944
mongodb-php-bot merged 1 commit intov2.xfrom
merge-v2.2-into-v2.x-1770973748021

Conversation

@mongodb-php-bot
Copy link
Collaborator

Merge new changes from v2.2 into v2.x.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge v2.x -m "Resolve conflicts in v2.x"

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:
git reset --hard v2.x
git merge --strategy=ours v2.2 -m "Ignore changes from v2.2"

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 February 13, 2026 09:09
@mongodb-php-bot mongodb-php-bot requested review from alcaeus and removed request for a team February 13, 2026 09:09
@mongodb-php-bot mongodb-php-bot merged commit f97d9db into v2.x Feb 13, 2026
71 of 72 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v2.2-into-v2.x-1770973748021 branch February 13, 2026 09: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.

3 participants