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/18 15:13] – [Private copy of a repository and pull requests] 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 45: | Line 49: | ||
echo "Your github username has been set to \" | echo "Your github username has been set to \" | ||
git clone git@github.com: | git clone git@github.com: | ||
+ | cd ExoDiBosonResonances | ||
</ | </ | ||
Line 55: | Line 60: | ||
</ | </ | ||
- | 4. Pull latest changes in branch edbr_tautau from the main repository | + | You can check the result of this command by typing |
- | < | + | git remote -v |
- | git pull cms-edbr edbr_tautau | + | |
- | </code> | + | 4. Update to the edbr_tautau branch (this will move the HEAD): |
+ | |||
+ | | ||
+ | |||
+ | Fetch latest changes in branch edbr_tautau from the main repository | ||
+ | |||
+ | git fetch cms-edbr edbr_tautau | ||
+ | |||
+ | and merge | ||
+ | |||
+ | git merge edbr_tautau cms-edbr/edbr_tautau | ||
+ | git merge FETCH_HEAD origin/ | ||
+ | |||
+ | To preview what this would do you can try | ||
+ | |||
+ | git log ..cms-edbr/ | ||
+ | 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 73: | Line 94: | ||
< | < | ||
git push origin edbr_tautau | git push origin edbr_tautau | ||
+ | git push origin master #generally | ||
</ | </ | ||
Line 78: | Line 100: | ||
https:// | https:// | ||
and make a pull request to move your changes to the project repository by clicking on "Pull Request", | and make a pull request to move your changes to the project repository by clicking on "Pull Request", | ||
- |