Skip to content

Merge 5.0 into 5.1 #3211

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

Merged
merged 3 commits into from
Nov 20, 2024
Merged

Merge 5.0 into 5.1 #3211

merged 3 commits into from
Nov 20, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 5.0 into 5.1.

Commits

Resolving conflicts

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

Ignoring changes

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

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

@mongodb-php-bot mongodb-php-bot merged commit e6edd63 into 5.1 Nov 20, 2024
78 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.0-into-5.1-1732115459910 branch November 20, 2024 15:13
# 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