Skip to content

Merge 4.8 into 5.0 #3224

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
wants to merge 1 commit into from
Closed

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-42020: queues feedback

* JS small fix
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner December 2, 2024 15:02
@github-actions github-actions bot added the docs label Dec 2, 2024
@rustagir rustagir closed this Dec 2, 2024
auto-merge was automatically disabled December 2, 2024 15:06

Pull request was closed

@rustagir
Copy link
Contributor

rustagir commented Dec 2, 2024

Separate changes apply for v5.0+ See #3222

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