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'
Auto-merging Configuration/PyReleaseValidation/python/relval_standard.py
Auto-merging Configuration/PyReleaseValidation/python/relval_steps.py
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       | 10 ++++++----
 Configuration/StandardSequences/python/Eras.py                 |  1 +
 PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py |  5 +++--
 PhysicsTools/PatAlgos/python/slimming/genParticles_cff.py      |  3 ++-
 PhysicsTools/PatAlgos/python/slimming/slimming_cff.py          |  4 +++-
 RecoHI/HiEvtPlaneAlgos/python/HiEvtPlane_cfi.py                |  3 ++-
 RecoHI/HiTracking/python/HILowPtConformalPixelTracks_cfi.py    | 10 +++++-----
 RecoTracker/TkSeedGenerator/python/trackerClusterCheck_cfi.py  |  3 ++-
 .../PrimaryVertexProducer/python/OfflinePrimaryVertices_cfi.py |  2 +-
 SimCalorimetry/HcalTrigPrimProducers/python/hcaltpdigi_cff.py  |  7 ++++++-
 SimGeneral/Configuration/python/SimGeneral_EventContent_cff.py |  3 ++-
 14 files changed, 43 insertions(+), 20 deletions(-)
 create mode 100644 Configuration/Eras/python/Era_Run3_2025_UPC_OXY_cff.py
Switched to branch 'from-CMSSW_15_1_X_2025-04-16-1100'