Skip to content

Merge v2.3 into v2.x#2012

Closed
mongodb-drivers-pr-bot[bot] wants to merge 2 commits intov2.xfrom
merge-v2.3-into-v2.x-1777885675428
Closed

Merge v2.3 into v2.x#2012
mongodb-drivers-pr-bot[bot] wants to merge 2 commits intov2.xfrom
merge-v2.3-into-v2.x-1777885675428

Conversation

@mongodb-drivers-pr-bot
Copy link
Copy Markdown
Contributor

Merge new changes from v2.3 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.3 -m "Ignore changes from v2.3"

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

…2011)

PHP 8.6 removed XtOffsetOf from php_stdint.h, so use the standard offsetof macro for object fetch helpers.

Co-authored-by: Andy Postnikov <apostnikov@gmail.com>
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot Bot enabled auto-merge May 4, 2026 09:07
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot Bot requested a review from a team as a code owner May 4, 2026 09:07
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot Bot requested review from paulinevos and removed request for a team May 4, 2026 09:08
@GromNaN GromNaN disabled auto-merge May 4, 2026 09:51
@GromNaN
Copy link
Copy Markdown
Member

GromNaN commented May 4, 2026

Superseded by #2013

@GromNaN GromNaN closed this May 4, 2026
@GromNaN GromNaN deleted the merge-v2.3-into-v2.x-1777885675428 branch May 4, 2026 09: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