Differences

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

--- computing:git [2013/12/20 11:35] – clange
+++ computing:git [2017/03/04 15:20] (current) – [CMSSW and github] iwn
@@ Line 1: / Line 1: @@
 ====== CMSSW and github ======
   * [[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]]
   * [[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]]
   * [[computing:git:basics|Basic git commands to work with CMSSW]]
@@ Line 70: / Line 70: @@
 and merge
-  git merge FETCH_HEAD
+  git merge edbr_tautau cms-edbr/edbr_tautau
+  git merge FETCH_HEAD origin/master #generally
 To preview what this would do you can try
-  git log ..FETCH_HEAD
+  git log ..cms-edbr/edbr_tautau
-  git diff ...FETCH_HEAD
+  git diff ...cms-edbr/edbr_tautau #used to be FETCH_HEAD
 . Make local changes, add these files for a commit and commit
@@ Line 89: / Line 90: @@
 <code>
 git push origin edbr_tautau
+git push origin master #generally
 </code>

CMS Wiki Pages