Skip to content

Conversation

mongodb-php-bot
Copy link
Collaborator

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

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge v1.x

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v1.x and manually merge using the `ours` merge strategy:
git reset --hard v1.x
git merge --strategy=ours v1.20

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

@alcaeus
Copy link
Member

alcaeus commented Dec 11, 2024

Note: Windows build failures are unrelated and occur due to the SDK setup failing temporarily.

@mongodb-php-bot mongodb-php-bot merged commit 1a1e793 into v1.x Dec 11, 2024
129 of 134 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.20-into-v1.x-1733930740591 branch December 11, 2024 15:54
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