Skip to content

Conversation

@mongodb-drivers-pr-bot
Copy link
Contributor

Merge new changes from v1 into release/2.0.

Commits

Resolving conflicts

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

Ignoring changes

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

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

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot merged commit a629254 into release/2.0 May 29, 2025
10 of 14 checks passed
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot deleted the merge-v1-into-release/2.0-1748455609569 branch May 29, 2025 18:19
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