Skip to content

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v2.1 into v2.x.

Commits

Resolving conflicts

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

Ignoring changes

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

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

Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
Signed-off-by: mongodb-dbx-release-bot[bot] <167856002+mongodb-dbx-release-bot[bot]@users.noreply.github.com>
@alcaeus alcaeus disabled auto-merge June 13, 2025 12:38
@alcaeus alcaeus merged commit ceff078 into v2.x Jun 13, 2025
113 of 114 checks passed
@alcaeus alcaeus deleted the merge-v2.1-into-v2.x-1749817302094 branch June 13, 2025 12:39
@alcaeus
Copy link
Member

alcaeus commented Jun 13, 2025

Merging over red CI - this is due to evergreen reporting the full commit workflow that includes testing against the next major version if libmongoc in v2.1, which currently fails.

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