From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47308/head -> cms-sw/refs/pull/47308/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 FWCore/ParameterSet/python/Mixins.py | 13 +++--
 FWCore/ParameterSet/python/Types.py  | 96 ++++++++++++++++++++++++++++++++++--
 2 files changed, 103 insertions(+), 6 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-02-11-1100'