Skip to content

Conversation

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

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

Merge new changes from release/2.2 into master.

Commits

Resolving conflicts

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

Ignoring changes

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

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

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot requested a review from a team as a code owner May 5, 2025 21:40
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot enabled auto-merge May 5, 2025 21:40
Copy link
Contributor Author

API Change Report

No changes found!

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot merged commit 7acde7d into master May 5, 2025
13 of 16 checks passed
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot deleted the merge-release/2.2-into-master-1746481223008 branch May 5, 2025 22:04
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.

1 participant