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 DataFormats/SiStripCluster/src/SiStripCluster.cc Auto-merging DataFormats/SiStripCluster/src/classes_def.xml CONFLICT (content): Merge conflict in DataFormats/SiStripCluster/src/classes_def.xml Automatic merge failed; fix conflicts and then commit the result. Unable to merge branch refs/pull/47367/head from repository cms-sw.