Skip to content

Merge v1.21 into v2.1#1917

Merged
mongodb-dbx-release-bot[bot] merged 1 commit intov2.1from
merge-v1.21-into-v2.1-1769588768255
Jan 28, 2026
Merged

Merge v1.21 into v2.1#1917
mongodb-dbx-release-bot[bot] merged 1 commit intov2.1from
merge-v1.21-into-v2.1-1769588768255

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 08:26
@mongodb-php-bot mongodb-php-bot requested review from jmikola and removed request for a team January 28, 2026 08:26
@mongodb-dbx-release-bot mongodb-dbx-release-bot bot merged commit 16ee2bc into v2.1 Jan 28, 2026
72 of 74 checks passed
@mongodb-dbx-release-bot mongodb-dbx-release-bot bot deleted the merge-v1.21-into-v2.1-1769588768255 branch January 28, 2026 08:32
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