From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47627/head -> cms-sw/refs/pull/47627/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 Auto-merging Configuration/PyReleaseValidation/python/relval_standard.py Auto-merging Configuration/PyReleaseValidation/python/relval_steps.py Auto-merging DQM/Integration/python/clients/onlinebeammonitor_dqm_sourceclient-live_cfg.py Auto-merging EventFilter/Utilities/interface/EvFDaqDirector.h Auto-merging EventFilter/Utilities/src/DAQSource.cc Auto-merging EventFilter/Utilities/src/EvFDaqDirector.cc Auto-merging EventFilter/Utilities/src/FedRawDataInputSource.cc Auto-merging HLTrigger/Configuration/python/customizeHLTforCMSSW.py CONFLICT (content): Merge conflict in HLTrigger/Configuration/python/customizeHLTforCMSSW.py Automatic merge failed; fix conflicts and then commit the result. Unable to merge branch refs/pull/47627/head from repository cms-sw.