Skip to content

Merge v1.19 into master #1620

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
Aug 27, 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.

@alcaeus
Copy link
Member

alcaeus commented Aug 27, 2024

@GromNaN I'll have to manually update this due to master already having a newer libmongoc version. I'll do that later today.

@alcaeus alcaeus disabled auto-merge August 27, 2024 13:08
@alcaeus alcaeus merged commit 413df61 into master Aug 27, 2024
68 of 70 checks passed
@alcaeus alcaeus deleted the merge-v1.19-into-master-1724751089635 branch August 27, 2024 13:08
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.

3 participants