Skip to content

Conversation

mongodb-drivers-pr-bot[bot]
Copy link
Contributor

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot commented May 2, 2025

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 enabled auto-merge May 2, 2025 16:06
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot added the review-priority-low Low Priority PR for Review: within 3 business days label May 2, 2025
Copy link
Contributor Author

API Change Report

No changes found!

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot merged commit 2216a17 into release/2.1 May 3, 2025
32 of 36 checks passed
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot deleted the merge-release/2.0-into-release/2.1-1746201960453 branch May 3, 2025 00:04
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

1 participant