From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47846/head -> cms-sw/refs/pull/47846/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 Configuration/Eras/python/Era_Run3_2025_OXY_cff.py             |  5 +++--
 Configuration/Eras/python/Era_Run3_2025_UPC_OXY_cff.py         |  6 ++++++
 Configuration/PyReleaseValidation/python/relval_standard.py    |  1 +
 Configuration/PyReleaseValidation/python/relval_steps.py       |  2 ++
 Configuration/StandardSequences/python/Eras.py                 |  1 +
 RecoHI/HiTracking/python/HILowPtConformalPixelTracks_cfi.py    | 10 +++++-----
 RecoTracker/TkSeedGenerator/python/trackerClusterCheck_cfi.py  |  3 ++-
 .../PrimaryVertexProducer/python/OfflinePrimaryVertices_cfi.py |  2 +-
 8 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 Configuration/Eras/python/Era_Run3_2025_UPC_OXY_cff.py
Switched to branch 'from-CMSSW_15_1_X_2025-04-11-1100'