Skip to content

Conversation

@mongodb-drivers-pr-bot
Copy link
Contributor

Merge new changes from release/1.17 into release/2.2.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge release/2.2

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to release/2.2 and manually merge using the `ours` merge strategy:
git reset --hard release/2.2
git merge --strategy=ours release/1.17

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

@mongodb-drivers-pr-bot
Copy link
Contributor Author

API Change Report

No changes found!

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot merged commit 2017dfe into release/2.2 Aug 5, 2025
31 of 38 checks passed
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot deleted the merge-release/1.17-into-release/2.2-1754038769689 branch August 5, 2025 06:55
@alcaeus alcaeus removed the request for review from matthewdale August 5, 2025 06:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants