Skip to content

Merge 5.4 into 5.x #3369

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

Closed
wants to merge 1 commit into from
Closed

Conversation

mongodb-php-bot
Copy link
Collaborator

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.

…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 requested a review from a team as a code owner April 22, 2025 08:22
@mongodb-php-bot mongodb-php-bot requested a review from GromNaN April 22, 2025 08:22
@GromNaN
Copy link
Member

GromNaN commented Apr 22, 2025

Superseded by #3370.

@GromNaN GromNaN closed this Apr 22, 2025
auto-merge was automatically disabled April 22, 2025 08:23

Pull request was closed

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.

2 participants