Skip to content

Merge v2.1 into v2.x#1918

Closed
mongodb-php-bot wants to merge 4 commits intov2.xfrom
merge-v2.1-into-v2.x-1769589131031
Closed

Merge v2.1 into v2.x#1918
mongodb-php-bot wants to merge 4 commits intov2.xfrom
merge-v2.1-into-v2.x-1769589131031

Conversation

@mongodb-php-bot
Copy link
Collaborator

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

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge 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.1

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

alcaeus and others added 4 commits January 28, 2026 09:25
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
@alcaeus
Copy link
Member

alcaeus commented Jan 28, 2026

Closing in favour of the next merge-up once the release workflow is fixed.

@alcaeus alcaeus closed this Jan 28, 2026
auto-merge was automatically disabled January 28, 2026 08:48

Pull request was closed

@alcaeus alcaeus deleted the merge-v2.1-into-v2.x-1769589131031 branch January 28, 2026 08:48
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