search

vhbb / cmssw

CMS Offline Software
cms-sw.github.io/cmssw
4 stars 5 forks source link

current repository version doesn't merge topic in CMSSW_8_0_21 #590

Closed perrozzi closed 7 years ago

perrozzi commented 7 years ago

happy new year. there seems to be a problem in the repository. when trying to download the vhbb repository with git cms-merge-topic -u vhbb:vhbbHeppy80X I get

" [...] Automatic merge failed; fix conflicts and then commit the result.
Unable to merge branch vhbbHeppy80X from repository vhbb."

and git status says [...]

# Unmerged paths:
#   (use "git add <file>..." to mark resolution)
#
#       both modified:      PhysicsTools/PatAlgos/test/corMETFromMiniAOD.py
#       both modified:      PhysicsTools/PatUtils/python/tools/runMETCorrectionsAndUncertainties.py
#       both modified:      RecoMET/METProducers/python/METSignificanceParams_cfi.py
#
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       deleted:    L1Trigger/L1TGlobal/data
arizzi commented 7 years ago

fixed in #591