Skip to content

Merge release/2.2 into master #2090

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

Conversation

mongodb-drivers-pr-bot[bot]
Copy link
Contributor

Merge new changes from release/2.2 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 release/2.2

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

qingyang-hu and others added 4 commits June 5, 2025 18:17
…ons from `7891688` to `6118deb` (#2008)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Preston Vasquez <[email protected]>
…891689

* release/2.2:
  Revert "Bump testdata/specifications from to 43d2c7b"
#2020)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot requested a review from a team as a code owner June 6, 2025 14:06
@alcaeus
Copy link
Member

alcaeus commented Jun 6, 2025

Note: this PR should NOT be merged until #2088 is merged.

…749161891689

Merge release/2.2 into master
…com:mongodb/mongo-go-driver into merge-release/2.2-into-master-1749218797481
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot merged commit 8715790 into master Jun 6, 2025
9 of 12 checks passed
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot deleted the merge-release/2.2-into-master-1749218797481 branch June 6, 2025 16:18
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