Skip to content

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.

@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner June 20, 2024 06:19
@mongodb-php-bot mongodb-php-bot requested a review from alcaeus June 20, 2024 06:19
@alcaeus alcaeus disabled auto-merge June 20, 2024 07:37
@alcaeus alcaeus merged commit 95df33d into master Jun 20, 2024
@alcaeus alcaeus deleted the merge-v1.19-into-master-1718864338930 branch June 20, 2024 07:37
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