Skip to content

Merge v2.5 into v2.x - #2201

Closed
mongodb-drivers-pr-bot[bot] wants to merge 1 commit into
v2.xfrom
merge-v2.5-into-v2.x-1793352089665
Closed

mongodb-drivers-pr-bot[bot] wants to merge 1 commit into
v2.xfrom
merge-v2.5-into-v2.x-1793352089665

Conversation

@mongodb-drivers-pr-bot

Copy link
Copy Markdown
Contributor

Merge new changes from v2.5 into v2.x.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge v2.x -m "Resolve conflicts in v2.x"

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:
git reset --hard v2.x
git merge --strategy=ours v2.5 -m "Ignore changes from v2.5"

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

@mongodb-drivers-pr-bot
mongodb-drivers-pr-bot Bot requested a review from a team as a code owner October 30, 2026 09:21
@mongodb-drivers-pr-bot
mongodb-drivers-pr-bot Bot requested review from GromNaN and removed request for a team October 30, 2026 09:21
@GromNaN

GromNaN commented Oct 30, 2026

Copy link
Copy Markdown
Member

Superseded by #2202

@GromNaN GromNaN closed this Oct 30, 2026
auto-merge was automatically disabled October 30, 2026 11:27

Pull request was closed

@GromNaN
GromNaN deleted the merge-v2.5-into-v2.x-1793352089665 branch October 30, 2026 11:27
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.

1 participant