Skip to content

Workflow

marcusfuchs edited this page Mar 23, 2015 · 3 revisions

We use a workflow similar to that of the Annex 60 Library. Therefore, the following text is taken from the Annex 60 Wiki with minor modifications:

  1. Open a new issue, and assign it to the one who can address it (which may be you).
  2. Make a new branch starting from the master branch. Call this branch something like issue17_templateBoiler, use the issue number and a brief description of the revised feature.
  3. Document your changes on the issue tracker and implement them on the branch. You may want to include in the commit message a string such as #17. This will automatically add a link to the commit from the issue.
  4. When done with the implementation:
  • merge the latest version from the master to your branch
  • make a pull request from your branch to the master
  • assign the issue to someone for review and for merging it into the master branch
  1. When reviewing other's code, add your comments on the issue tracker
  2. If the revisions are reviewed and correct, merge the pull requests to the master, delete the branch and close the ticket. If the revisions need further work, assign the issue to the original author.

Note that only the person who reviewed the code will merge it to the master. Don't merge your own revisions without having them reviewed.

Clone this wiki locally