Skip to content

Conversation

@mongodb-drivers-pr-bot
Copy link
Contributor

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot commented May 6, 2025

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.

@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot requested a review from a team as a code owner May 6, 2025 17:41
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot enabled auto-merge May 6, 2025 17:41
@mongodb-drivers-pr-bot mongodb-drivers-pr-bot bot added the review-priority-low Low Priority PR for Review: within 3 business days label May 6, 2025
@mongodb-drivers-pr-bot
Copy link
Contributor Author

API Change Report

No changes found!

@prestonvasquez
Copy link
Member

We don't traditionally update master with patch version.

auto-merge was automatically disabled May 6, 2025 18:42

Pull request was closed

@prestonvasquez prestonvasquez reopened this May 6, 2025
@alcaeus alcaeus force-pushed the merge-release/2.2-into-master-1746553259504 branch 2 times, most recently from 10f57ab to f42e076 Compare May 7, 2025 12:42
@evergreen-ci-prod
Copy link

There is an existing patch(es) for this commit SHA:

Please note that the status that is posted is not in the context of this PR but rather the (latest) existing patch and that may affect some tests that may depend on the particular PR. If your tests do not rely on any PR-specific values (like base or head branch name) then your tests will report the same status. If you would like a patch to run in the context of this PR and abort the other(s), comment 'evergreen retry'.

@alcaeus alcaeus enabled auto-merge May 7, 2025 12:42
@alcaeus alcaeus removed the request for review from prestonvasquez May 7, 2025 12:44
@alcaeus
Copy link
Member

alcaeus commented May 7, 2025

Manually excluded the bump commit to ensure release/2.2 is fully merged into master. I'll create a separate PR to mark the bump commit as merged without applying changes.

@alcaeus alcaeus merged commit e86c9aa into master May 7, 2025
15 of 18 checks passed
@alcaeus alcaeus deleted the merge-release/2.2-into-master-1746553259504 branch May 7, 2025 12:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

review-priority-low Low Priority PR for Review: within 3 business days

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants