From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48052/head -> cms-sw/refs/pull/48052/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 FWCore/Framework/src/ProductResolvers.cc           | 17 +++++++-----
 FWCore/Services/plugins/Tracer.cc                  |  4 +--
 .../TFileAdaptor/interface/TStorageFactoryFile.h   |  2 --
 IOPool/TFileAdaptor/src/TStorageFactoryFile.cc     |  2 +-
 .../test/python/g4OverlapCheckCalo_cfg.py          |  9 +++++--
 .../test/python/g4OverlapCheckEcal_cfg.py          |  9 +++++--
 .../test/python/g4OverlapCheckMuon_cfg.py          |  9 +++++--
 .../test/python/g4OverlapCheckRun4DD4hep_cfg.py    |  4 +--
 .../test/python/g4OverlapCheckRun4DDD_cfg.py       |  4 +--
 .../test/python/g4OverlapCheckTracker_cfg.py       |  9 +++++--
 .../PrintGeomInfo/test/python/runDD4hepRun4_cfg.py |  4 +--
 .../PrintGeomInfo/test/python/runDDDRun4_cfg.py    |  4 +--
 .../test/python/runMaterialBudgeInfoRun4_cfg.py    |  4 +--
 .../test/python/runPrintG4Solids2_cfg.py           |  4 +--
 .../test/python/runPrintG4Solids_cfg.py            |  4 +--
 .../test/python/runPrintG4TouchRun4_cfg.py         |  4 +--
 .../test/python/runPrintSolidRun4_cfg.py           |  4 +--
 .../PrintGeomInfo/test/python/runSensRun4_cfg.py   |  4 +--
 .../test/python/runSummaryRun4_cfg.py              |  4 +--
 .../StorageFactory/interface/StorageAccountProxy.h |  2 +-
 .../StorageFactory/src/StorageAccountProxy.cc      |  2 +-
 .../test/runMaterialBudgetVolumeRun4DD4hep_cfg.py  | 29 +++++++++++----------
 .../test/runMaterialBudgetVolumeRun4DDD_cfg.py     | 30 ++++++++++------------
 23 files changed, 95 insertions(+), 73 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-05-09-1700'