Skip to content

Conversation

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

Merge new changes from release/2.3 into master.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge master -m "Resolve conflicts in 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.3 -m "Ignore changes from release/2.3"

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

matthewdale and others added 7 commits September 3, 2025 13:52
* 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)
…/2.2-1757094714306

Merge release/1.17 into release/2.2
…2.3-1758814175486

Merge release/2.2 into release/2.3
@matthewdale matthewdale added review-priority-normal Medium Priority PR for Review: within 1 business day ignore-for-release labels Sep 26, 2025
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 8e5bd6f into master Sep 26, 2025
9 of 13 checks passed
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot deleted the merge-release/2.3-into-master-1758814677558 branch September 26, 2025 03:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ignore-for-release 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