Skip to content

Conversation

@mongodb-drivers-pr-bot
Copy link
Contributor

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot commented May 3, 2025

Merge new changes from release/2.1 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/2.1

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

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot enabled auto-merge May 3, 2025 00:04
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot merged commit d739e42 into release/2.2 May 5, 2025
7 of 8 checks passed
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot deleted the merge-release/2.1-into-release/2.2-1746230656976 branch May 5, 2025 15:53
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