-
Notifications
You must be signed in to change notification settings - Fork 135
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
[fixme] #2883 conflicts with staging-30 #2893
Merged
dd-mergequeue
merged 4 commits into
staging-30
from
fix-merge-612c73e5bd-into-staging-30
Jul 25, 2024
Merged
[fixme] #2883 conflicts with staging-30 #2893
dd-mergequeue
merged 4 commits into
staging-30
from
fix-merge-612c73e5bd-into-staging-30
Jul 25, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…3e5bd-into-staging-30
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## staging-30 #2893 +/- ##
==============================================
+ Coverage 93.78% 93.81% +0.03%
==============================================
Files 269 269
Lines 7607 7603 -4
Branches 1691 1689 -2
==============================================
- Hits 7134 7133 -1
+ Misses 473 470 -3 ☔ View full report in Codecov by Sentry. |
…3e5bd-into-staging-30
Bundles Sizes Evolution
🚀 CPU Performance
🧠 Memory Performance
|
/resume |
🚂 Branch Integration: Resume integration Resuming integrating commit 612c73e5bd into staging-30 Use |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We couldn't merge the commit 612c73e5bd from #2883 into staging-30, there is a conflict!
We created this pull request so that you can fix those conflicts by clicking on the
Resolve conflicts
button at the bottom of this page.If the conflicts are not trivial, you can also resolve them locally by running the following commands in your terminal:
When this is done, DO NOT MARK THIS PR AS READY FOR REVIEW but comment it with
/resume
, we will merge the fix branch into the target branch for you.Alternatively, you can cancel this operation by commenting this PR with
/resume -c