View Code? Open in Web Editor
NEW
This project forked from cern-ph-cmg/cmg-cmssw
CERN CMG Tools repository. Installation instructions available on the twiki:
Home Page: https://twiki.cern.ch/twiki/bin/viewauth/CMS/CMGToolsReleasesExperimental
C++ 66.94%
C 3.44%
Python 27.20%
Perl 0.51%
Tcl 0.01%
Shell 0.81%
Smarty 0.01%
Perl 6 0.01%
PHP 0.03%
JavaScript 0.31%
HTML 0.31%
Makefile 0.02%
Objective-C 0.15%
Rebol 0.05%
SQLPL 0.01%
Awk 0.01%
CSS 0.02%
PLSQL 0.14%
Java 0.03%
XSLT 0.01%
cmg-cmssw-central's People
cmg-cmssw-central's Issues
Hi,
I'm getting the following conflicts when trying to pull the alphaT repository,
[smalik@lxplus0061 src]$ git pull alphaT-repo CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6
Enter passphrase for key '/afs/cern.ch/user/s/smalik/.ssh/id_rsa':
remote: Counting objects: 498, done.
remote: Compressing objects: 100% (174/174), done.
remote: Total 498 (delta 381), reused 416 (delta 322)
Receiving objects: 100% (498/498), 87.33 KiB | 0 bytes/s, done.
Resolving deltas: 100% (381/381), done.
From github.com:CMSRA1/cmg-cmssw
- branch CMG_MiniAOD_Lite_V6_0_from-CMSSW_7_0_6 -> FETCH_HEAD
Auto-merging CMGTools/TTHAnalysis/python/analyzers/ttHIsoTrackSkimmer.py
CONFLICT (add/add): Merge conflict in CMGTools/TTHAnalysis/python/analyzers/ttHIsoTrackSkimmer.py
Auto-merging CMGTools/TTHAnalysis/python/analyzers/ttHGenLevelAnalyzer.py
CONFLICT (content): Merge conflict in CMGTools/TTHAnalysis/python/analyzers/ttHGenLevelAnalyzer.py
Automatic merge failed; fix conflicts and then commit the result.