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 4.2 into 4.3 #2832

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
mongodb-php-bot wants to merge 21 commits into 4.3 from merge-4.2-into-4.3-1712587048718
Closed

Conversation

@mongodb-php-bot
Copy link
Collaborator

@mongodb-php-bot mongodb-php-bot commented Apr 8, 2024

Merge new changes from 4.2 into 4.3.

Commits

Resolving conflicts

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

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to 4.3 and manually merge using the `ours` merge strategy:
git reset --hard 4.3
git merge --strategy=ours 4.2

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

Chris Cho and others added 20 commits March 25, 2024 16:56
* DOCSP-37618: Usage Examples landing page
* fix refs
* update TOC
* format fix
* CC feedback
* remove info
* add back
* typo
* CC feedback 2
* add section toc
* feedback, removing tabs
* workflow file
* edits
* fix
* more CC feedback
* run -> use
* changes to running instructions
* turn back into steps
* small fixes
* more reworking
* reword
* reworking
* feedback
* newline
* remove file
* edits
* fix
* DOCSP-35974: Update one usage example
* fixes
* other usage ex changes
* reworking the example
* add tip, spacing
* restructuring
* reword tip
* fixes
* edits
* reword
* add more running info
* small change
* edits
* source constant
* test file
* move test file
* single quotes
* print syntax
* print statement again
* JT feedback
* apply phpcbf formatting
* code
* apply phpcbf formatting
* JT feedback
* Fix UpdateOneTest example
* add to TOC
---------
Co-authored-by: norareidy <norareidy@users.noreply.github.com>
Co-authored-by: Jérôme Tamarelle <jerome@tamarelle.net>
* DOCSP-38076: quick start changes for Laravel 11
* DOCSP-36631: laravel feature compatibility
* NR PR fixes 1
Adds a usage example page showing how to retrieve one document
---------
Co-authored-by: norareidy <norareidy@users.noreply.github.com>
Co-authored-by: Jérôme Tamarelle <jerome@tamarelle.net>
* DOCSP-35966: Query builder docs standardization
Copy link
Member

GromNaN commented Apr 9, 2024

Closing in favor of #2835

@alcaeus alcaeus deleted the merge-4.2-into-4.3-1712587048718 branch April 10, 2024 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

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

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

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