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 5.4 into 5.x #3370

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
mongodb-php-bot merged 2 commits into 5.x from merge-5.4-into-5.x-1745310183711
Apr 22, 2025
Merged

Merge 5.4 into 5.x #3370

mongodb-php-bot merged 2 commits into 5.x from merge-5.4-into-5.x-1745310183711
Apr 22, 2025

Conversation

Copy link
Collaborator

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

Merge new changes from 5.4 into 5.x.

Commits

Resolving conflicts

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

Ignoring changes

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

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

GromNaN and others added 2 commits April 22, 2025 10:21 
...ted to use the sessions at all with a more simple sanity check (#3366) (#3368)
Set zend.assertions=1
---------
Co-authored-by: Toni Vega <1808267+tonivega@users.noreply.github.com>
@mongodb-php-bot mongodb-php-bot merged commit b5864f4 into 5.x Apr 22, 2025
288 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.4-into-5.x-1745310183711 branch April 22, 2025 08:27
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

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

Assignees
No one assigned
Labels
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

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