Skip to content

Merge v2.1 into v2.x #1750

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
merged 4 commits into from
Aug 14, 2025
Merged

Conversation

mongodb-php-bot
Copy link
Collaborator

Merge new changes from v2.1 into v2.x.

Commits

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:
git merge v2.x

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:
git reset --hard v2.x
git merge --strategy=ours v2.1

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

@mongodb-php-bot mongodb-php-bot requested a review from a team as a code owner August 13, 2025 20:50
@codecov-commenter
Copy link

codecov-commenter commented Aug 13, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 87.72%. Comparing base (002fad6) to head (f399d24).
⚠️ Report is 36 commits behind head on v2.x.
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff            @@
##               v2.x    #1750   +/-   ##
=========================================
  Coverage     87.72%   87.72%           
  Complexity     3190     3190           
=========================================
  Files           424      424           
  Lines          6346     6348    +2     
=========================================
+ Hits           5567     5569    +2     
  Misses          779      779           
Flag Coverage Δ
6.0-replica_set 85.68% <100.00%> (+<0.01%) ⬆️
6.0-server 81.69% <100.00%> (+<0.01%) ⬆️
6.0-sharded_cluster 85.27% <100.00%> (+<0.01%) ⬆️
8.0-replica_set 87.64% <100.00%> (+<0.01%) ⬆️
8.0-server 82.57% <100.00%> (+<0.01%) ⬆️
8.0-sharded_cluster 87.31% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@mongodb-php-bot mongodb-php-bot merged commit 4aed966 into v2.x Aug 14, 2025
53 checks passed
@mongodb-php-bot mongodb-php-bot deleted the merge-v2.1-into-v2.x-1755118217067 branch August 14, 2025 12:40
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.

4 participants