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.1 into 5.x #3284

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.1-into-5.x-1740168547682
Feb 21, 2025
Merged

Merge 5.1 into 5.x #3284

mongodb-php-bot merged 1 commit into 5.x from merge-5.1-into-5.x-1740168547682
Feb 21, 2025

Conversation

@mongodb-php-bot
Copy link
Collaborator

@mongodb-php-bot mongodb-php-bot commented Feb 21, 2025

Merge new changes from 5.1 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.1

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

* DOCSP-38130: Time sereies collections
* apply phpcbf formatting
* fix
* build error
* JT feedback
* apply phpcbf formatting
* fixes
* apply phpcbf formatting
* JT feedback 2
@mongodb-php-bot mongodb-php-bot merged commit 37a7710 into 5.x Feb 21, 2025
95 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.1-into-5.x-1740168547682 branch February 21, 2025 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@norareidy norareidy norareidy approved these changes

@rustagir rustagir Awaiting requested review from rustagir rustagir is a code owner automatically assigned from mongodb/laravel-docs

Assignees

No one assigned

Labels

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

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