Skip to content

Merge release/2.2 into master #2036

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/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 15:53
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot enabled auto-merge May 5, 2025 15:53
auto-merge was automatically disabled May 5, 2025 15:58

Pull request was closed

@prestonvasquez prestonvasquez reopened this May 6, 2025
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot added dependencies Pull requests that update a dependency file priority-3-low Low Priority PR for Review labels May 6, 2025
Copy link
Contributor Author

API Change Report

No changes found!

@prestonvasquez prestonvasquez deleted the merge-release/2.2-into-master-1746460399814 branch May 6, 2025 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file priority-3-low Low Priority PR for Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant