Skip to content

Merge v1.19 into master #1354

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
Jun 27, 2024

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.19 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.19

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

)

* Add tags and aliases for better testing in tags and pull requests

* Remove result expectation of flaky test

See mongodb/specifications#1604 for the corresponding specs PR"
@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner June 27, 2024 15:42
@mongodb-php-bot mongodb-php-bot requested a review from alcaeus June 27, 2024 15:42
@mongodb-php-bot mongodb-php-bot merged commit 9acbedd into master Jun 27, 2024
46 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.19-into-master-1719502959967 branch June 27, 2024 16:13
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