Skip to content

Merge v1.19 into master #1570

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 3 commits into from
May 28, 2024
Merged

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.

Signed-off-by: DBX PHP Release Bot <[email protected]>
Signed-off-by: DBX PHP Release Bot <[email protected]>
@mongodb-php-bot mongodb-php-bot enabled auto-merge May 28, 2024 17:04
@mongodb-php-bot mongodb-php-bot merged commit 098c2c8 into master May 28, 2024
@mongodb-php-bot mongodb-php-bot deleted the merge-v1.19-into-master-1716915844414 branch May 28, 2024 17:28
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