From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47367/head -> cms-sw/refs/pull/47367/head
Switched to branch 'merge-attempt'
Auto-merging Configuration/StandardSequences/python/Eras.py
Auto-merging DataFormats/SiStripCluster/src/SiStripCluster.cc
Auto-merging DataFormats/SiStripCluster/src/classes_def.xml
Merge made by the 'ort' strategy.
 .../python/Era_Run3_2024_approxSiStripClusters_cff.py     |  6 ++++++
 Configuration/StandardSequences/python/Eras.py            |  1 +
 .../SiStripCluster/interface/SiStripApproximateCluster.h  | 15 +++++++++++----
 .../SiStripCluster/src/SiStripApproximateCluster.cc       |  7 +++++--
 DataFormats/SiStripCluster/src/SiStripCluster.cc          |  2 +-
 DataFormats/SiStripCluster/src/classes_def.xml            |  3 ++-
 6 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 Configuration/Eras/python/Era_Run3_2024_approxSiStripClusters_cff.py
 mode change 100755 => 100644 DataFormats/SiStripCluster/src/classes_def.xml
Switched to branch 'from-CMSSW_15_1_X_2025-02-17-2300'