Skip to content

Merge release/2.2 into master #2085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3 commits merged into from
Jun 5, 2025
Merged

Conversation

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

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.

prestonvasquez and others added 3 commits June 5, 2025 12:08
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot closed this pull request by merging all changes into master in 93d8cda Jun 5, 2025
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot deleted the merge-release/2.2-into-master-1749150136961 branch June 5, 2025 22:00
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