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 #3432

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 1 commit into 5.x from merge-5.4-into-5.x-1753081169940
Jul 21, 2025
Merged

Merge 5.4 into 5.x #3432

mongodb-php-bot merged 1 commit into 5.x from merge-5.4-into-5.x-1753081169940
Jul 21, 2025

Conversation

Copy link
Collaborator

@mongodb-php-bot mongodb-php-bot commented Jul 21, 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 -m "Resolve conflicts in 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 -m "Ignore changes from 5.4"

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

...3429)
* Fix ID handling when using insert method instead of save
* Add test with non-incrementing model
@mongodb-php-bot mongodb-php-bot merged commit 3362948 into 5.x Jul 21, 2025
227 of 263 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.4-into-5.x-1753081169940 branch July 21, 2025 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alcaeus alcaeus alcaeus 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 によって変換されたページ (->オリジナル) /