Weekly Software Meeting

Europe/Zurich
42/3-002 (CERN)

42/3-002

CERN

30
Show room on map
Benedikt Hegner (CERN)
    • 12:30 12:50
      Core framework status 20m
      Speaker: Benedikt Hegner (CERN)
      Slides
    • 12:50 13:20
      Git tutorial 30m
      Speaker: Colin Bernet (Ecole Polytechnique (FR))
      more information

      - Fork HEP-FCC FCCSW
      - Clone your FCCSW (ssh protocol)
      git clone git@github.com:cbernet/FCCSW.git

      - Check remote 
      git remote -v

      - see the commit tree
      git l 

      - connect HEP-FCC FCCSW as remote (https protocol)

      - Check remotes
      git remote -v

      - Fetch fcc information
      git fetch fcc

      - see the commit tree
      git l 

      - make a local tracking branch for fcc/master
      git checkout -t fcc/master

      - a local master branch exists. find it
      git l

      - delete
      git branch -d master
      git l 
      git branch -d master 

      - cannot delete branch which we are on 
      git co fcc/master
      git l
      git branch -d master 
      git checkout -t fcc/master
      git l 

      - check the branch is a tracking branch and its status
      git branch -vv 

      - push master to origin so that it's in phase with fcc 
      git push origin master 

      - prepare for development. make a new branch
      git checkout -b git_test_colin 
      git branch -vv 
      git l 

      - check status of working directory (local code)
      git s 

      - make development
      cd Tests/Git/cbern
      echo foo > bar.txt

      - prepare commit 
      git s 
      git add bar.tx
      git commit -m 'added dummy file for git test'
      git l 

      - push git_test_colin to origin
      git push origin git_test_colin

      - pull request on github
      - pull from fcc in local dir