Skip to content

Merge 5.1 into 5.x - #3212

Merged
mongodb-php-bot merged 4 commits into
5.xfrom
merge-5.1-into-5.x-1732115624656
Nov 20, 2024
Merged

mongodb-php-bot merged 4 commits into
5.xfrom
merge-5.1-into-5.x-1732115624656

Conversation

@mongodb-php-bot

Copy link
Copy Markdown
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 merged commit 01672f5 into 5.x Nov 20, 2024
@mongodb-php-bot
mongodb-php-bot deleted the merge-5.1-into-5.x-1732115624656 branch November 20, 2024 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants