Skip to content
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

Merge v1.20 into master #1630

Merged
merged 1 commit into from
Sep 5, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.20 into master.

Commits

Resolving conflicts

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

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to master and manually merge using the `ours` merge strategy:
git reset --hard master
git merge --strategy=ours v1.20

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

@mongodb-php-bot mongodb-php-bot merged commit 5c4c373 into master Sep 5, 2024
136 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.20-into-master-1725517226883 branch September 5, 2024 06:32
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