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 16:44
@github-actions github-actions bot added the review-priority-normal Medium Priority PR for Review: within 1 business day label Sep 5, 2025
@prestonvasquez prestonvasquez requested review from prestonvasquez and removed request for qingyang-hu September 8, 2025 19:00
@alcaeus
Copy link
Member

alcaeus commented Sep 22, 2025

Closing; ignoring all commits from 1.17 in #2193.

@alcaeus alcaeus closed this Sep 22, 2025
auto-merge was automatically disabled September 22, 2025 18:19

Pull request was closed

@alcaeus alcaeus deleted the merge-release/1.17-into-release/2.2-1757090650617 branch September 22, 2025 18:19
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