Skip to content
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
merged 4 commits into from
Jul 25, 2024

Conversation

dd-devflow[bot]
Copy link

@dd-devflow dd-devflow bot commented Jul 25, 2024

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:

git fetch origin fix-merge-612c73e5bd-into-staging-30 staging-30
git checkout fix-merge-612c73e5bd-into-staging-30
git merge origin/staging-30
# fix the conflicts and commit
git push origin fix-merge-612c73e5bd-into-staging-30

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

@dd-devflow dd-devflow bot added the fixing-pr label Jul 25, 2024
@dd-devflow dd-devflow bot mentioned this pull request Jul 25, 2024
4 tasks
@codecov-commenter
Copy link

codecov-commenter commented Jul 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.81%. Comparing base (9b08fd6) to head (ade14bf).

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.
📢 Have feedback on the report? Share it here.

Copy link

Bundles Sizes Evolution

📦 Bundle Name Base Size Local Size 𝚫 𝚫% Status
Rum 158.60 KiB 159.02 KiB 437 B +0.27%
Logs 55.74 KiB 55.78 KiB 44 B +0.08%
Rum Slim 107.46 KiB 107.50 KiB 44 B +0.04%
Worker 25.21 KiB 25.21 KiB 0 B 0.00%
🚀 CPU Performance
Action Name Base Average Cpu Time (ms) Local Average Cpu Time (ms) 𝚫
addglobalcontext 0.002 N/A N/A
addaction 0.036 N/A N/A
adderror 0.036 N/A N/A
addtiming 0.001 N/A N/A
startview 1.094 N/A N/A
startstopsessionreplayrecording 0.984 N/A N/A
logmessage 0.023 N/A N/A
🧠 Memory Performance
Action Name Base Consumption Memory (bytes) Local Consumption Memory (bytes) 𝚫 (bytes)
addglobalcontext 19.03 KiB 21.03 KiB 2.00 KiB
addaction 71.84 KiB 74.41 KiB 2.57 KiB
adderror 88.13 KiB 87.12 KiB -1028 B
addtiming 17.86 KiB 19.03 KiB 1.17 KiB
startview 348.46 KiB 352.27 KiB 3.81 KiB
startstopsessionreplayrecording 13.29 KiB 15.05 KiB 1.75 KiB
logmessage 72.27 KiB 71.27 KiB -1021 B

🔗 RealWorld

@thomas-lebeau
Copy link
Collaborator

/resume

@dd-devflow
Copy link
Author

dd-devflow bot commented Jul 25, 2024

🚂 Branch Integration: Resume integration

Resuming integrating commit 612c73e5bd into staging-30

Use /resume -c to cancel this operation!

@dd-mergequeue dd-mergequeue bot merged commit a6a057e into staging-30 Jul 25, 2024
19 checks passed
@dd-mergequeue dd-mergequeue bot deleted the fix-merge-612c73e5bd-into-staging-30 branch July 25, 2024 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants