Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Merge v2.1 into v2.x #1877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alcaeus merged 2 commits into v2.x from merge-v2.1-into-v2.x-1758784699123
Sep 25, 2025
Merged

Merge v2.1 into v2.x #1877

alcaeus merged 2 commits into v2.x from merge-v2.1-into-v2.x-1758784699123
Sep 25, 2025

Conversation

@mongodb-php-bot
Copy link
Collaborator

@mongodb-php-bot mongodb-php-bot commented Sep 25, 2025

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

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge 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.1

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

@alcaeus alcaeus removed the request for review from paulinevos September 25, 2025 08:55
@alcaeus alcaeus merged commit 10e4566 into v2.x Sep 25, 2025
131 of 132 checks passed
@alcaeus alcaeus deleted the merge-v2.1-into-v2.x-1758784699123 branch September 25, 2025 09:22
Copy link
Member

alcaeus commented Sep 25, 2025

Failing test was the libmongoc-latest variant which isn't relevant, merging despite red CI.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GromNaN GromNaN GromNaN approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /