Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merge 4.8 into 5.0 #3116

Merged
merged 1 commit into from
Aug 26, 2024
Merged

Merge 4.8 into 5.0 #3116

merged 1 commit into from
Aug 26, 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.

@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner August 26, 2024 13:38
@mongodb-php-bot mongodb-php-bot merged commit f3bb644 into 5.0 Aug 26, 2024
75 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-4.8-into-5.0-1724679487811 branch August 26, 2024 15:33
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants