Coder Social home page Coder Social logo

cmsra1 / cmg-cmssw-central Goto Github PK

View Code? Open in Web Editor NEW

This project forked from cern-ph-cmg/cmg-cmssw

0.0 0.0 2.0 887.47 MB

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

Contributors

arizzi avatar cmsbuild avatar davidlange6 avatar deguio avatar dr15jones avatar ekfriis avatar ferencek avatar gartung avatar gpetruc avatar ianna avatar jimbrooke avatar ktf avatar lgray avatar makortel avatar mariadalfonso avatar martin-grunewald avatar mtosi avatar nclopezo avatar pelmer avatar perrotta avatar rappoccio avatar rickyegeland avatar rovere avatar smorovic avatar smuzaffar avatar steggema avatar taisakuma avatar vininn avatar vlimant avatar wmtan avatar

Watchers

avatar avatar avatar avatar avatar avatar avatar

Forkers

dsmiff lucien1011

cmg-cmssw-central's Issues

pull error

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.

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.