Skip to content

Conversation

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

@alcaeus
Copy link
Member

alcaeus commented May 6, 2025

Closing for #2043.

@alcaeus alcaeus closed this May 6, 2025
auto-merge was automatically disabled May 6, 2025 18:27

Pull request was closed

@alcaeus alcaeus deleted the merge-release/2.2-into-master-1746548414786 branch May 6, 2025 18:27
@prestonvasquez prestonvasquez restored the merge-release/2.2-into-master-1746548414786 branch May 6, 2025 18:48
@prestonvasquez prestonvasquez reopened this May 6, 2025
@mongodb-drivers-pr-bot
Copy link
Contributor Author

API Change Report

No changes found!

@prestonvasquez prestonvasquez merged commit 81ca253 into master May 6, 2025
31 of 36 checks passed
@prestonvasquez prestonvasquez deleted the merge-release/2.2-into-master-1746548414786 branch May 6, 2025 20:09
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.

2 participants