From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47698/head -> cms-sw/refs/pull/47698/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. CalibTracker/SiStripCommon/plugins/ShallowGainCalibration.cc | 2 +- Calibration/TkAlCaRecoProducers/src/AlcaBeamSpotManager.cc | 3 +-- CondCore/CondDB/src/ConnectionPool.cc | 2 +- CondCore/ESSources/plugins/CondDBESSource.cc | 2 +- CondFormats/RPCObjects/src/RPCReadOutMapping.cc | 2 +- DQM/GEM/plugins/GEMRecHitSource.cc | 4 ++-- 6 files changed, 7 insertions(+), 8 deletions(-) Switched to branch 'from-CMSSW_15_1_X_2025-03-25-2300'