mirror of
https://github.com/XRPLF/rippled.git
synced 2026-09-27 07:26:51 +00:00
9fd5414fe6
Ten conflict regions in four files, none of them caused by the rename. phase-8's own commit had rewritten comments in files phase-7 owns (Unit.h, HistogramBuckets.h, OTelCollector.cpp) and in Telemetry.cpp, while the same sweep ran independently on phase-7. Resolved every region to phase-7's side on ownership grounds: those files belong to phase-7 or earlier, so a downstream branch should not carry divergent copies. phase-8 changed comments only in all four, verified against the merge base, so no code was dropped. The one structural region: phase-7 had refactored addUnitView from an inline lambda into a member function, and phase-8 still held the lambda. Keeping phase-8's would have shadowed the member. Wording phase-8 had that is worth restoring on phase-7 -- the "legacy" qualifier on the prefix parameter, and the rejected-alternative note on the bucket ladders -- is recorded outside the tree for a follow-up.