Instructions for Working with GlueX Git Repositories
From GlueXWiki
Revision as of 12:52, 14 July 2015 by Marki (Talk | contribs) (Marki moved page Simple Instructions for Working with Hall D's Git Repository to Instructions for Working with GlueX Git Repositories: Better name)
The Workflow
Let's use the sim-recon repository as an example.
- Create local repository in the current directory
-
git clone https:/github.com/jeffersonlab/sim-recon
-
- Create a local branch
-
cd sim-recon
-
git branch my_work
-
- Check-out the new branch
-
git checkout my_work
-
- ... work on topic branch, make changes, add them, commit them...
- Push local branch to public branch
-
git push origin my_work:new_bug_fix
- creates branch "new_bug_fix" on public repository
-
- Issue pull request
- go to the GitHub site and log in
- navigate to the repository page (https://github.com/JeffersonLab/sim-recon)
- switch to the "new_bug_fix" branch (pull down menu)
- click on "pull request"
- fill in and submit web form
- creates action item on GitHub, a request that changes on branch "new_bug_fix" be merged into master branch
- Ask someone else to act on pull request. They
- go to the GitHub site and log in
- navigate to the repository page (https://github.com/JeffersonLab/sim-recon)
- click on "pull requests" in the right-hand column
- fill in and submit web form to merge in changes
Notes on this Workflow
- Everyone needs an account on GitHub.
- Anyone can update the master branch.
- Changes should go onto topic branches, but enforced only administratively.