Skip to content

Comments

[fixme] #4185 conflicts with staging-08#4213

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 6 commits intostaging-08from
fix-merge-245d68f70a-into-staging-08
Feb 19, 2026
Merged

[fixme] #4185 conflicts with staging-08#4213
gh-worker-dd-mergequeue-cf854d[bot] merged 6 commits intostaging-08from
fix-merge-245d68f70a-into-staging-08

Conversation

@gh-worker-dd-devflow-36fce6
Copy link

Note

TL,DR: Fix the conflicts and use /resume to merge.
⚠️ Do not mark this pull request as ready for review.

We couldn't automatically merge the commit 245d68f70a from #4185 into staging-08, 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-245d68f70a-into-staging-08 staging-08
git checkout fix-merge-245d68f70a-into-staging-08
git merge origin/staging-08

Once you solved the conflicts, you can finish the merge and push your fix by running:

git merge --continue
git push origin fix-merge-245d68f70a-into-staging-08

Finally, you can resume the integration of this change by either:

  • commenting /resume on this pull request, or clicking on the "Resume" button at the bottom of the page if you have Doggo installed.
  • running the following command directly in your terminal while having the fix branch checked out:
    ddr devflow resume
    
    Note: Once the command started, you can exit it at any time and switch branch to keep working locally. It will finish in the background.

Alternatively, you can cancel this operation by commenting this pull request with /resume -c

@cit-pr-commenter-54b7da
Copy link

cit-pr-commenter-54b7da bot commented Feb 19, 2026

Bundles Sizes Evolution

📦 Bundle Name Base Size Local Size 𝚫 𝚫% Status
Rum N/A 173.24 KiB N/A N/A N/A
Rum Profiler N/A 4.76 KiB N/A N/A N/A
Rum Recorder N/A 24.88 KiB N/A N/A N/A
Logs N/A 56.32 KiB N/A N/A N/A
Flagging N/A 944 B N/A N/A N/A
Rum Slim N/A 128.96 KiB N/A N/A N/A
Worker N/A 23.63 KiB N/A N/A N/A
🚀 CPU Performance
Action Name Base CPU Time (ms) Local CPU Time (ms) 𝚫%
addglobalcontext N/A 0.0042 N/A
addaction N/A 0.0131 N/A
adderror N/A 0.0149 N/A
addtiming N/A 0.0026 N/A
startview N/A 0.0123 N/A
startstopsessionreplayrecording N/A 0.0008 N/A
logmessage N/A 0.0145 N/A
🧠 Memory Performance
Action Name Base Memory Consumption Local Memory Consumption 𝚫
addglobalcontext N/A 25.64 KiB N/A
addaction N/A 48.64 KiB N/A
addtiming N/A 26.88 KiB N/A
adderror N/A 54.43 KiB N/A
startstopsessionreplayrecording N/A 25.70 KiB N/A
startview N/A 452.21 KiB N/A
logmessage N/A 46.82 KiB N/A

🔗 RealWorld

@datadog-official
Copy link

datadog-official bot commented Feb 19, 2026

✅ Tests

🎉 All green!

❄️ No new flaky tests detected
🧪 All tests passed

🎯 Code Coverage (details)
Patch Coverage: 80.82%
Overall Coverage: 77.14% (+0.00%)

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 5a04e58 | Docs | Datadog PR Page | Was this helpful? Give us feedback!

@sethfowler-datadog
Copy link
Contributor

/resume

@gh-worker-devflow-routing-ef8351
Copy link

gh-worker-devflow-routing-ef8351 bot commented Feb 19, 2026

View all feedbacks in Devflow UI.

2026-02-19 12:11:48 UTC ℹ️ Start processing command /resume
Use /resume -c to cancel this operation!


2026-02-19 12:11:55 UTC ℹ️ Branch Integration: Resume integration

Resuming integrating commit 245d68f70a into staging-08

Use /resume -c to cancel this operation!


⏳ Triggering DDCI... This can take a few minutes.

@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d bot merged commit 23229dc into staging-08 Feb 19, 2026
19 of 20 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d bot deleted the fix-merge-245d68f70a-into-staging-08 branch February 19, 2026 12:24
@github-actions github-actions bot locked and limited conversation to collaborators Feb 19, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants