Skip to content

Conversation

@mongodb-php-bot
Copy link
Collaborator

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

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

@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner April 23, 2024 19:02
@mongodb-php-bot mongodb-php-bot requested a review from GromNaN April 23, 2024 19:02
@alcaeus alcaeus enabled auto-merge April 23, 2024 19:02
@alcaeus alcaeus merged commit d6333d7 into master Apr 23, 2024
@alcaeus alcaeus deleted the merge-v1.18-into-master-1713898930206 branch April 23, 2024 19:24
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