Instructions for Working with GlueX Git Repositories

From GlueXWiki
Revision as of 09:52, 14 July 2015 by Marki (Talk | contribs) (Created page with "==The Workflow== # create local repository #* git clone https:/github.com/jeffersonlab/sim-recon # create a local topic branch #* git branch my\_work # move to the new topic...")

(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to: navigation, search

The Workflow

  1. create local repository
    • git clone https:/github.com/jeffersonlab/sim-recon
  2. create a local topic branch
    • git branch my\_work
  3. move to the new topic branch
    • git checkout my\_work
  4. ... work on topic branch, make changes, add them, commit them...
  5. push local topic branch to public topic branch
    • git push origin my\_work:new\_bug\_fix
    • creates branch "new\_bug\_fix" on public repository
  6. issue pull request
    • go to the GitHub site and log in
    • navigate to the branch, click on "pull request"
    • creates action item on GitHub
    • requests that changes on branch "new\_bug\_fix" be merged onto master branch on public repository
  7. someone else acts on pull request on GitHub
    • go to the GitHub site and log in
    • navigate to open pull requests
    • 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.