Merge v1.x into v2.x - Githubissues

mongodb / mongo-php-driver

The Official MongoDB PHP driver

https://pecl.php.net/package/mongodb

Apache License 2.0

892 stars 205 forks source link

Merge v1.x into v2.x #1749

Closed mongodb-php-bot closed 1 week ago

mongodb-php-bot commented 2 weeks ago

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

Commits

PHPC-2473: Bump to libmongoc 1.29.0 (#1748): 6ede0aa1

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 v1.x Then, push the temporary branch to upate the pull request.

jmikola commented 1 week ago

Closing in favor of https://github.com/mongodb/mongo-php-driver/pull/1754.