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 v1.21 into v1.x #1815

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 1 commit into v1.x from merge-v1.21-into-v1.x-1744380012882
Apr 14, 2025
Merged

Merge v1.21 into v1.x #1815

alcaeus merged 1 commit into v1.x from merge-v1.21-into-v1.x-1744380012882
Apr 14, 2025

Conversation

@mongodb-php-bot
Copy link
Collaborator

@mongodb-php-bot mongodb-php-bot commented Apr 11, 2025

Merge new changes from v1.21 into v1.x.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge v1.x

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v1.x and manually merge using the `ours` merge strategy:
git reset --hard v1.x
git merge --strategy=ours v1.21

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

...1814)
* PHPC-2537 Update to newer Ubuntu version in GitHub Actions workflows
* Fix clang-format script for ubuntu 24.04
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner April 11, 2025 14:00
@mongodb-php-bot mongodb-php-bot requested review from jmikola and removed request for a team April 11, 2025 14:00
@alcaeus alcaeus disabled auto-merge April 14, 2025 12:37
@alcaeus alcaeus merged commit 0629d11 into v1.x Apr 14, 2025
111 of 112 checks passed
@alcaeus alcaeus deleted the merge-v1.21-into-v1.x-1744380012882 branch April 14, 2025 12:37
This was referenced Apr 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jmikola jmikola Awaiting requested review from jmikola jmikola is a code owner automatically assigned from mongodb/dbx-php

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

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