Skip to content

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v1.21 into v2.1.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge v2.1

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v2.1 and manually merge using the `ours` merge strategy:
git reset --hard v2.1
git merge --strategy=ours v1.21

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 October 7, 2025 14:38
@mongodb-php-bot mongodb-php-bot requested review from alcaeus and removed request for a team October 7, 2025 14:38
@mongodb-dbx-release-bot mongodb-dbx-release-bot bot merged commit fa5b433 into v2.1 Oct 7, 2025
108 of 109 checks passed
@mongodb-dbx-release-bot mongodb-dbx-release-bot bot deleted the merge-v1.21-into-v2.1-1759847878139 branch October 7, 2025 14:54
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