Skip to content

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v2.0 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.0

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

GromNaN and others added 3 commits April 11, 2025 15:58
* PHPLIB-1662 Update GHA test jobs to ubuntu-22.04

* Run only MongoDB versions supported by ubuntu-22.04

* Use a PHP extension cache unique per driver version

* Update ubuntu versions for other jobs
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner April 11, 2025 14:44
@mongodb-php-bot mongodb-php-bot requested a review from GromNaN April 11, 2025 14:44
@alcaeus alcaeus disabled auto-merge April 14, 2025 12:24
@alcaeus alcaeus merged commit a4ccccd into v2.x Apr 14, 2025
51 of 52 checks passed
@alcaeus alcaeus deleted the merge-v2.0-into-v2.x-1744382660875 branch April 14, 2025 12:24
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.

3 participants