Skip to content

Merge release/1.17 into release/2.2 #2081

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

Conversation

mongodb-drivers-pr-bot[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.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.

Verified

This commit was signed with the committer’s verified signature.
prestonvasquez Preston Vasquez

Verified

This commit was signed with the committer’s verified signature.
prestonvasquez Preston Vasquez
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot merged commit b4e89cc into release/2.2 Jun 5, 2025
41 of 46 checks passed
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot deleted the merge-release/1.17-into-release/2.2-1749071220181 branch June 5, 2025 01:10
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.

None yet

1 participant