User Tools

Site Tools


computing:git

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision
Previous revision
Last revisionBoth sides next revision
computing:git [2013/12/20 16:25] clangecomputing:git [2017/03/04 15:20] – [CMSSW and github] iwn
Line 1: Line 1:
 ====== CMSSW and github ====== ====== CMSSW and github ======
 +<WRAP column 50%>
   * [[http://cms-sw.github.io/cmssw/faq.html|CMSSW github FAQ]]   * [[http://cms-sw.github.io/cmssw/faq.html|CMSSW github FAQ]]
   * [[https://help.github.com/articles/how-do-i-add-a-collaborator|How to add collaborators]]   * [[https://help.github.com/articles/how-do-i-add-a-collaborator|How to add collaborators]]
   * [[http://git-scm.com/book|Git Book]]   * [[http://git-scm.com/book|Git Book]]
 +  * [[https://education.github.com/git-cheat-sheet-education.pdf|Git Cheat Sheet]]
   * [[https://indico.cern.ch/conferenceDisplay.py?confId=286055|Git tutorial]]   * [[https://indico.cern.ch/conferenceDisplay.py?confId=286055|Git tutorial]]
   * [[computing:git:basics|Basic git commands to work with CMSSW]]   * [[computing:git:basics|Basic git commands to work with CMSSW]]
 +</WRAP> 
 +<WRAP column 50%> 
 +{{ computing:git_diagram.png ? 260}} 
 +</WRAP>
 ====== SVN switcher guide ====== ====== SVN switcher guide ======
  
Line 71: Line 75:
  
   git merge edbr_tautau cms-edbr/edbr_tautau   git merge edbr_tautau cms-edbr/edbr_tautau
 +  git merge FETCH_HEAD origin/master #generally
  
 To preview what this would do you can try To preview what this would do you can try
Line 89: Line 94:
 <code> <code>
 git push origin edbr_tautau git push origin edbr_tautau
 +git push origin master #generally
 </code> </code>
  
computing/git.txt · Last modified: 2017/03/04 15:20 by iwn