This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionLast revisionBoth sides next revision | ||
computing:git [2013/12/20 11:35] – clange | computing:git [2017/03/04 15:20] – [CMSSW and github] iwn | ||
---|---|---|---|
Line 1: | Line 1: | ||
====== CMSSW and github ====== | ====== CMSSW and github ====== | ||
+ | <WRAP column 50%> | ||
* [[http:// | * [[http:// | ||
* [[https:// | * [[https:// | ||
* [[http:// | * [[http:// | ||
+ | * [[https:// | ||
* [[https:// | * [[https:// | ||
* [[computing: | * [[computing: | ||
+ | </ | ||
+ | <WRAP column 50%> | ||
+ | {{ computing: | ||
+ | </ | ||
====== SVN switcher guide ====== | ====== SVN switcher guide ====== | ||
Line 70: | Line 74: | ||
and merge | and merge | ||
- | git merge FETCH_HEAD | + | |
+ | | ||
To preview what this would do you can try | To preview what this would do you can try | ||
- | git log ..FETCH_HEAD | + | git log ..cms-edbr/ |
- | git diff ...FETCH_HEAD | + | git diff ...cms-edbr/ |
5. Make local changes, add these files for a commit and commit | 5. Make local changes, add these files for a commit and commit | ||
Line 89: | Line 94: | ||
< | < | ||
git push origin edbr_tautau | git push origin edbr_tautau | ||
+ | git push origin master #generally | ||
</ | </ | ||