From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47171/head -> cms-sw/refs/pull/47171/head Switched to branch 'merge-attempt' Auto-merging CondCore/ESSources/plugins/CondDBESSource.cc CONFLICT (content): Merge conflict in CondCore/ESSources/plugins/CondDBESSource.cc Auto-merging CondCore/ESSources/plugins/CondDBESSource.h Auto-merging CondCore/ESSources/python/CondDBESSource_cfi.py CONFLICT (content): Merge conflict in CondCore/ESSources/python/CondDBESSource_cfi.py Automatic merge failed; fix conflicts and then commit the result. Unable to merge branch refs/pull/47171/head from repository cms-sw.