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

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.1-into-5.x-1733152274635
Dec 2, 2024
Merged

Merge 5.1 into 5.x #3227

mongodb-php-bot merged 2 commits into 5.x from merge-5.1-into-5.x-1733152274635
Dec 2, 2024

Conversation

@mongodb-php-bot
Copy link
Collaborator

@mongodb-php-bot mongodb-php-bot commented Dec 2, 2024

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.

rustagir and others added 2 commits December 2, 2024 15:08
* DOCSP-42020: queues feedback
(cherry picked from commit 830ba9f)
* DOCSP-42020: queues feedback - 5.0+
* JS small fix
* replace cxn with db in tables
@mongodb-php-bot mongodb-php-bot merged commit a257a9f into 5.x Dec 2, 2024
78 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.1-into-5.x-1733152274635 branch December 2, 2024 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

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

1 more reviewer

@rustagir rustagir rustagir approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

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