Skip to content

Merge v1.21 into v2.1#1924

Merged
mongodb-php-bot merged 1 commit intov2.1from
merge-v1.21-into-v2.1-1769594158749
Jan 28, 2026
Merged

Merge v1.21 into v2.1#1924
mongodb-php-bot merged 1 commit intov2.1from
merge-v1.21-into-v2.1-1769594158749

Conversation

@mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.21 into v2.1.

Commits

Resolving conflicts

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

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v2.1 and manually merge using the `ours` merge strategy:
git reset --hard v2.1
git merge --strategy=ours v1.21

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 January 28, 2026 09:56
@mongodb-php-bot mongodb-php-bot requested review from paulinevos and removed request for a team January 28, 2026 09:56
@alcaeus alcaeus requested review from alcaeus and removed request for paulinevos January 28, 2026 09:56
@mongodb-php-bot mongodb-php-bot merged commit 37cf913 into v2.1 Jan 28, 2026
83 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.21-into-v2.1-1769594158749 branch January 28, 2026 10:18
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