Skip to content

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.

* DOCSP-48860: DOCS+ tutorial WIP

* wip

* add to toc

* LM PR fixes 1

* fix spacing

* LM PR fixes 2
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner June 2, 2025 14:35
@mongodb-php-bot mongodb-php-bot requested a review from rustagir June 2, 2025 14:35
@mongodb-php-bot mongodb-php-bot enabled auto-merge June 2, 2025 14:35
@github-actions github-actions bot added the docs label Jun 2, 2025
@mongodb-php-bot mongodb-php-bot merged commit f464797 into 5.x Jun 2, 2025
210 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.4-into-5.x-1748874936917 branch June 2, 2025 14:38
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.

3 participants