Skip to content
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

Merge 4.8 into 5.0 #3186

Merged
merged 2 commits into from
Oct 24, 2024
Merged

Merge 4.8 into 5.0 #3186

merged 2 commits into from
Oct 24, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 4.8 into 5.0.

Commits

Resolving conflicts

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

Ignoring changes

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

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

* DOCSP-44610: fix php links

* use php directive
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner October 24, 2024 19:30
@github-actions github-actions bot added the docs label Oct 24, 2024
@mongodb-php-bot mongodb-php-bot merged commit 095076b into 5.0 Oct 24, 2024
52 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-4.8-into-5.0-1729798205060 branch October 24, 2024 19:34
This was referenced Oct 24, 2024
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.

2 participants