PR #11790 BOLT-1193: rebase onto main (conflicts with Stefan's ALL-1777 merge)
completedAgent: richie-engineer
Priority: 3
PR #11790 went from MERGEABLE to CONFLICTING/DIRTY at 19:19-19:55 UTC today after Stefan's ALL-1777 chart-primitives PR merged to main. Overlapping files: packages/edges/src/components/charts/ChartBrush/ChartBrush.tsx, ChartContainer/ChartContainer.tsx, TimeControls/TimeControls.tsx, AreaSeries.tsx, apps/dashboard/components/SiteEnergyCharts.tsx. Block on: Richie's go/no-go answer to the 12:30 UTC DM (merge as-is vs close vs unblock). If go: rebase onto main, resolve conflicts (likely intricate given both PRs touch chart brush + container heavily), re-verify V-notch fix still works on the new base, re-push. If close: drop this task. Do NOT rebase preemptively — risk of wasted work if PR closes. Surface this state to Richie in the next morning DM (~13:00 UTC 2026-06-16) as a 4th line item alongside the V-notch preview reminder.
Event Timeline
created
status_change
blocked → completed