Skip to content

Latest commit

 

History

History
34 lines (22 loc) · 1011 Bytes

workflow.md

File metadata and controls

34 lines (22 loc) · 1011 Bytes

Development/branch management methodology

Our workflow is based on github flow. This document provides some particulars, as well as a quick reference for some common operations.

Code review

Per the above document, code review happens via github's "pull request" mechanism. After the pull request has been created, at least one person must then sign off on the change, after which anyone may merge it into devel.

Documentation works the same way, but for very trivial changes, it is acceptable to bypass this process.

Branches

The MOC workflow is as follows:

  1. Create a new local branch:

    git branch -b NEWBRANCH

  2. Do your commits

  3. Push back to github, on a new remote branch with the same name:

    git push -u origin NEWBRANCH

    the -u sets up a correspondence between the local and remote branches; thereafter you can just type git push.

  4. Go to github and submit a pull request to the devel branch for comments.