Skip to content

Conversation

mongodb-drivers-pr-bot[bot]
Copy link
Contributor

Merge new changes from release/2.3 into master.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge master -m "Resolve conflicts in 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.3 -m "Ignore changes from release/2.3"

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

Copy link
Collaborator

@matthewdale matthewdale left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! 👍

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot merged commit 957d13a into master Sep 26, 2025
9 of 11 checks passed
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot deleted the merge-release/2.3-into-master-1758912148856 branch September 26, 2025 19:34
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