From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/47642/head -> cms-sw/refs/pull/47642/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../interface/AllowedLabelsDescriptionBase.h       |   6 +-
 .../ParameterSet/interface/EmptyGroupDescription.h |   6 +-
 .../ParameterSet/interface/IfExistsDescription.h   |   6 +-
 .../ParameterSet/interface/ParameterDescription.h  |   4 +-
 .../interface/ParameterDescriptionBase.h           |   8 +-
 .../interface/ParameterDescriptionNode.h           |  25 ++--
 .../interface/ParameterSetDescription.h            | 152 +++++++++++++--------
 FWCore/ParameterSet/interface/ParameterSwitch.h    |  20 +--
 .../ParameterSet/interface/ParameterSwitchBase.h   |   2 +-
 FWCore/ParameterSet/interface/ParameterWildcard.h  |   8 +-
 .../ParameterSet/interface/ParameterWildcardBase.h |   4 +-
 .../interface/ParameterWildcardWithSpecifics.h     |   2 +-
 FWCore/ParameterSet/interface/PluginDescription.h  |   4 +-
 FWCore/ParameterSet/src/ANDGroupDescription.cc     |  36 +++--
 FWCore/ParameterSet/src/ANDGroupDescription.h      |   6 +-
 .../src/AllowedLabelsDescriptionBase.cc            |  23 ++--
 FWCore/ParameterSet/src/EmptyGroupDescription.cc   |   6 +-
 FWCore/ParameterSet/src/IfExistsDescription.cc     |  40 +++---
 FWCore/ParameterSet/src/ORGroupDescription.cc      |  36 +++--
 FWCore/ParameterSet/src/ORGroupDescription.h       |   6 +-
 FWCore/ParameterSet/src/ParameterDescription.cc    |  17 ++-
 .../ParameterSet/src/ParameterDescriptionBase.cc   |  38 ++++--
 .../ParameterSet/src/ParameterDescriptionNode.cc   |   7 +-
 FWCore/ParameterSet/src/ParameterSetDescription.cc |  22 +--
 FWCore/ParameterSet/src/ParameterSwitchBase.cc     |  20 ++-
 FWCore/ParameterSet/src/ParameterWildcard.cc       |   8 +-
 FWCore/ParameterSet/src/ParameterWildcardBase.cc   |  17 ++-
 .../src/ParameterWildcardWithSpecifics.cc          |   4 +-
 FWCore/ParameterSet/src/XORGroupDescription.cc     |  45 +++---
 FWCore/ParameterSet/src/XORGroupDescription.h      |   6 +-
 .../test/test_catch_ParameterSetDescription.cc     | 142 ++++++++++++++++++-
 31 files changed, 496 insertions(+), 230 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-03-20-1100'