Skip to content

Conversation

@mongodb-drivers-pr-bot
Copy link
Contributor

Merge new changes from release/2.0 into release/2.1.

Commits

Resolving conflicts

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

Ignoring changes

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

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

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot added the review-priority-low Low Priority PR for Review: within 3 business days label Mar 7, 2025
@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 fb62199 into release/2.1 Mar 7, 2025
33 of 37 checks passed
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot deleted the merge-release/2.0-into-release/2.1-1741365148192 branch March 7, 2025 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

review-priority-low Low Priority PR for Review: within 3 business days

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant