From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/48515/head -> cms-sw/refs/pull/48515/head Switched to branch 'merge-attempt' Auto-merging Configuration/AlCa/python/autoCond.py CONFLICT (content): Merge conflict in Configuration/AlCa/python/autoCond.py Auto-merging Configuration/Applications/python/ConfigBuilder.py CONFLICT (content): Merge conflict in Configuration/Applications/python/ConfigBuilder.py Auto-merging Configuration/HLT/python/autoCondHLT.py CONFLICT (content): Merge conflict in Configuration/HLT/python/autoCondHLT.py Auto-merging Configuration/PyReleaseValidation/python/relval_standard.py Auto-merging Configuration/PyReleaseValidation/python/relval_steps.py CONFLICT (content): Merge conflict in Configuration/PyReleaseValidation/python/relval_steps.py Auto-merging Configuration/StandardSequences/python/GeometryConf.py CONFLICT (content): Merge conflict in Configuration/StandardSequences/python/GeometryConf.py Auto-merging DQM/Integration/python/clients/onlinebeammonitor_dqm_sourceclient-live_cfg.py Auto-merging DQM/Integration/test/BuildFile.xml Auto-merging DQM/SiStripMonitorHardware/src/SiStripSpyEventMatcher.cc Auto-merging DQMServices/FwkIO/plugins/DQMRootOutputModule.cc Auto-merging DQMServices/FwkIO/plugins/format.h Auto-merging EventFilter/Utilities/interface/DAQSource.h Auto-merging EventFilter/Utilities/interface/DAQSourceModels.h Auto-merging EventFilter/Utilities/interface/DAQSourceModelsDTH.h CONFLICT (content): Merge conflict in EventFilter/Utilities/interface/DAQSourceModelsDTH.h Auto-merging EventFilter/Utilities/interface/DAQSourceModelsFRD.h Auto-merging EventFilter/Utilities/interface/DTHHeaders.h CONFLICT (content): Merge conflict in EventFilter/Utilities/interface/DTHHeaders.h Auto-merging EventFilter/Utilities/interface/EvFDaqDirector.h Auto-merging EventFilter/Utilities/interface/FedRawDataInputSource.h Auto-merging EventFilter/Utilities/plugins/DTHFakeReader.cc CONFLICT (content): Merge conflict in EventFilter/Utilities/plugins/DTHFakeReader.cc Auto-merging EventFilter/Utilities/src/DAQSource.cc CONFLICT (content): Merge conflict in EventFilter/Utilities/src/DAQSource.cc Auto-merging EventFilter/Utilities/src/DAQSourceModelsDTH.cc Auto-merging EventFilter/Utilities/src/DAQSourceModelsFRD.cc Auto-merging EventFilter/Utilities/src/EvFDaqDirector.cc CONFLICT (content): Merge conflict in EventFilter/Utilities/src/EvFDaqDirector.cc Auto-merging EventFilter/Utilities/src/FedRawDataInputSource.cc Auto-merging EventFilter/Utilities/test/RunBUFU.sh CONFLICT (content): Merge conflict in EventFilter/Utilities/test/RunBUFU.sh Auto-merging EventFilter/Utilities/test/startFU_daqsource.py CONFLICT (add/add): Merge conflict in EventFilter/Utilities/test/startFU_daqsource.py Auto-merging EventFilter/Utilities/test/unittest_FU_daqsource.py Auto-merging FWCore/Framework/src/ScheduleItems.cc CONFLICT (content): Merge conflict in FWCore/Framework/src/ScheduleItems.cc Auto-merging FWCore/Framework/test/Event_t.cpp Auto-merging FWCore/Framework/test/checkForModuleDependencyCorrectness_t.cppunit.cc CONFLICT (content): Merge conflict in FWCore/Framework/test/checkForModuleDependencyCorrectness_t.cppunit.cc Auto-merging FWCore/Framework/test/edproducer_productregistry_callback.cc Auto-merging FWCore/Framework/test/event_getrefbeforeput_t.cppunit.cc Auto-merging FWCore/Framework/test/eventprincipal_t.cppunit.cc Auto-merging FWCore/Framework/test/generichandle_t.cppunit.cc CONFLICT (content): Merge conflict in FWCore/Framework/test/generichandle_t.cppunit.cc Auto-merging FWCore/Framework/test/maker2_t.cppunit.cc Auto-merging FWCore/Services/plugins/CPU.cc CONFLICT (content): Merge conflict in FWCore/Services/plugins/CPU.cc Auto-merging FWCore/Services/plugins/CondorStatusUpdater.cc CONFLICT (content): Merge conflict in FWCore/Services/plugins/CondorStatusUpdater.cc Auto-merging FWCore/Services/plugins/ResourceInformationService.cc Auto-merging FWCore/Sources/src/DaqProvenanceHelper.cc Auto-merging FWCore/TestProcessor/src/TestProcessor.cc Auto-merging GeneratorInterface/LHEInterface/plugins/BuildFile.xml Auto-merging HLTrigger/Configuration/python/HLT_2025v12_cff.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/HLT_2025v12_cff.py Auto-merging HLTrigger/Configuration/python/HLT_FULL_cff.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/HLT_FULL_cff.py Auto-merging HLTrigger/Configuration/python/HLT_Fake1_cff.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/HLT_Fake1_cff.py Auto-merging HLTrigger/Configuration/python/HLT_Fake2_cff.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/HLT_Fake2_cff.py Auto-merging HLTrigger/Configuration/python/HLT_Fake_cff.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/HLT_Fake_cff.py Auto-merging HLTrigger/Configuration/python/HLT_GRun_cff.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/HLT_GRun_cff.py Auto-merging HLTrigger/Configuration/python/HLT_HIon_cff.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/HLT_HIon_cff.py Auto-merging HLTrigger/Configuration/python/HLT_PIon_cff.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/HLT_PIon_cff.py Auto-merging HLTrigger/Configuration/python/HLT_PRef_cff.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/HLT_PRef_cff.py Auto-merging HLTrigger/Configuration/python/HLT_Special_cff.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/HLT_Special_cff.py Auto-merging HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py Auto-merging HLTrigger/Configuration/python/HLTrigger_Datasets_HIon_cff.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/HLTrigger_Datasets_HIon_cff.py Auto-merging HLTrigger/Configuration/python/HLTrigger_Datasets_PIon_cff.py Auto-merging HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py Auto-merging HLTrigger/Configuration/python/HLTrigger_Datasets_Special_cff.py Auto-merging HLTrigger/Configuration/python/customizeHLTforCMSSW.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/customizeHLTforCMSSW.py Auto-merging HLTrigger/Configuration/scripts/utils/hltPathOwners.json CONFLICT (content): Merge conflict in HLTrigger/Configuration/scripts/utils/hltPathOwners.json Auto-merging HLTrigger/Configuration/tables/GRun.txt Auto-merging HLTrigger/Configuration/tables/HIon.txt Auto-merging HLTrigger/Configuration/tables/makeOnlineGRun CONFLICT (content): Merge conflict in HLTrigger/Configuration/tables/makeOnlineGRun Auto-merging HLTrigger/Configuration/tables/makeOnlineSpecial CONFLICT (content): Merge conflict in HLTrigger/Configuration/tables/makeOnlineSpecial Auto-merging HLTrigger/Configuration/tables/online_grun.txt Auto-merging HLTrigger/Configuration/tables/online_hion.txt Auto-merging HLTrigger/Configuration/test/OnLine_HLT_2025v12.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/test/OnLine_HLT_2025v12.py Auto-merging HLTrigger/Configuration/test/OnLine_HLT_FULL.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/test/OnLine_HLT_FULL.py Auto-merging HLTrigger/Configuration/test/OnLine_HLT_Fake.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/test/OnLine_HLT_Fake.py Auto-merging HLTrigger/Configuration/test/OnLine_HLT_Fake1.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/test/OnLine_HLT_Fake1.py Auto-merging HLTrigger/Configuration/test/OnLine_HLT_Fake2.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/test/OnLine_HLT_Fake2.py Auto-merging HLTrigger/Configuration/test/OnLine_HLT_GRun.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/test/OnLine_HLT_GRun.py Auto-merging HLTrigger/Configuration/test/OnLine_HLT_HIon.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/test/OnLine_HLT_HIon.py Auto-merging HLTrigger/Configuration/test/OnLine_HLT_PIon.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/test/OnLine_HLT_PIon.py Auto-merging HLTrigger/Configuration/test/OnLine_HLT_PRef.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/test/OnLine_HLT_PRef.py Auto-merging HLTrigger/Configuration/test/OnLine_HLT_Special.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/test/OnLine_HLT_Special.py Auto-merging HLTrigger/Configuration/test/getFrozenHLT.sh CONFLICT (content): Merge conflict in HLTrigger/Configuration/test/getFrozenHLT.sh Auto-merging HeterogeneousCore/CUDAServices/plugins/CUDAService.cc Auto-merging HeterogeneousCore/ROCmServices/plugins/ROCmService.cc Auto-merging IOPool/Common/bin/EdmProvDump.cc Auto-merging IOPool/Input/src/ProvenanceAdaptor.cc Auto-merging IOPool/SecondaryInput/test/SecondaryProducer.cc CONFLICT (content): Merge conflict in IOPool/SecondaryInput/test/SecondaryProducer.cc Auto-merging L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc CONFLICT (content): Merge conflict in L1Trigger/L1TCalorimeter/plugins/L1TCaloStage2ParamsESProducer.cc Auto-merging Mixing/Base/src/PileUp.cc CONFLICT (content): Merge conflict in Mixing/Base/src/PileUp.cc Automatic merge failed; fix conflicts and then commit the result. Unable to merge branch refs/pull/48515/head from repository cms-sw.