Skip to content

Merge v2.1 into v2.x#1922

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

Merge v2.1 into v2.x#1922
mongodb-php-bot wants to merge 10 commits intov2.xfrom
merge-v2.1-into-v2.x-1769590838413

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 10 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>
* Fix workflow name for creating release artifacts

* Remove ref parameter from php-windows-builder
* v2.1: (50 commits)
  Back to -dev
  Package 2.1.5
  Back to -dev
  Package 2.1.4
  PHPC-2637: Update to libmongoc 1.30.6 (#1882) (#1887)
  Back to -dev
  Package 2.1.3
  Back to -dev
  Package 2.1.2
  PHPC-2617: Support PHP 8.5 (#1871)
  PHPC-2613: Test x509 authentication on Atlas (#1858)
  Back to -dev
  Package 2.1.1
  Back to -dev
  Package 2.1.0
  PHPC-2555: Stop testing with MongoDB 4.0 (#1827)
  PHPC-2510 Install evergreen tools using git submodule (#1797)
  Bump to libmongoc 1.30.4 (#1822)
  Feature: Client Bulk Write (#1818)
  Mention Serializable/Unserializable types in upgrade guide (#1805)
  ...
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>
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner January 28, 2026 09:00
@mongodb-php-bot mongodb-php-bot requested review from jmikola and removed request for a team January 28, 2026 09:00
@alcaeus
Copy link
Member

alcaeus commented Jan 28, 2026

Closing as there are more changes to merge.

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

Pull request was closed

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