Skip to content

Conversation

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

Merge new changes from release/1.17 into release/2.2.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge release/2.2

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to release/2.2 and manually merge using the `ours` merge strategy:
git reset --hard release/2.2
git merge --strategy=ours release/1.17

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

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot requested a review from a team as a code owner September 5, 2025 17:51
@github-actions github-actions bot added the review-priority-normal Medium Priority PR for Review: within 1 business day label Sep 5, 2025
* release/1.17:
  GODRIVER-3612 Add an internal-only NewSessionWithLSID API (v1) (#2183)
  Consider HTTP 429 a succcessful response in the Markdown link check. (#2191)
  Pin drivers-evergreen-tools to rev 98f6b0e in v1. (#2184)
  Retry Markdown link checks on HTTP 429 (v1) (#2186)
Copy link
Contributor Author

API Change Report

No changes found!

Copy link
Collaborator

@matthewdale matthewdale left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! 👍

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot merged commit df31d0e into release/2.2 Sep 25, 2025
35 of 38 checks passed
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot deleted the merge-release/1.17-into-release/2.2-1757094714306 branch September 25, 2025 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

review-priority-normal Medium Priority PR for Review: within 1 business day

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants