Skip to content

Merge v1.20 into v1.x #1669

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

Merged
merged 1 commit into from
Sep 19, 2024
Merged

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.20 into v1.x.

Commits

Resolving conflicts

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

Ignoring changes

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

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

@alcaeus alcaeus mentioned this pull request Sep 19, 2024
@mongodb-php-bot mongodb-php-bot merged commit 637ea48 into v1.x Sep 19, 2024
125 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.20-into-v1.x-1726727148533 branch September 19, 2024 06:38
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