-
-
Notifications
You must be signed in to change notification settings - Fork 289
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
chore: merge stable v1.12.1 back to unstable #6184
Conversation
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## unstable #6184 +/- ##
=========================================
Coverage 90.35% 90.35%
=========================================
Files 78 78
Lines 8087 8087
Branches 490 490
=========================================
Hits 7307 7307
Misses 772 772
Partials 8 8 |
Performance Report✔️ no performance regression detected 🚀🚀 Significant benchmark improvement detected
Full benchmark results
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This branch does not really merge stable back to unstable it just bumps the versions, are we fine with that and will just merge back stable to unstable with v1.13?
I resolved the conflict by doing a rebase which is not correct, need to merge manually to resolve conflicts instead |
Motivation
Merge stable back to unstable after v1.12.1 hotfix release, fix conflicts in #6183
Description
stable
branchgit rebase origin/unstable