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 5.1 into 5.x #3215

Merged
merged 4 commits into from
Nov 20, 2024
Merged

Merge 5.1 into 5.x #3215

merged 4 commits into from
Nov 20, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from 5.1 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.1

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 November 20, 2024 17:55
@github-actions github-actions bot added the docs label Nov 20, 2024
@mongodb-php-bot mongodb-php-bot merged commit 21baf0a into 5.x Nov 20, 2024
78 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-5.1-into-5.x-1732125323021 branch November 20, 2024 17:57
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants