Skip to content

Conversation

@mongodb-drivers-pr-bot
Copy link
Contributor

Merge new changes from release/2.4 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.4 -m "Ignore changes from release/2.4"

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

@prestonvasquez prestonvasquez enabled auto-merge (squash) November 19, 2025 19:03
@prestonvasquez prestonvasquez merged commit 4018aa3 into master Nov 19, 2025
9 of 12 checks passed
@prestonvasquez prestonvasquez deleted the merge-release/2.4-into-master-1763567219860 branch November 19, 2025 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants