Skip to content

Development Workflow

Jump to bottom
Joseph Tingsanchali edited this page Oct 21, 2016 · 1 revision

Because of the size of this project by implementing a few maps with Carto.js integrated with an already cleaned/scrubbed (is this true?) open-data set, I suggest we use the "feature branch workflow" detailed here: https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow.

Typical Workflow

  1. Developer will ensure they have pulled the latest master branch or chosen an earlier commit to branch from
  2. Developer will create a feature branch from that specific commit
  3. Developer will proceed to work on his branch
  4. Occasionally, developer will need to merge changes from master branch (or whichever parent branch they prefer) into their own feature branch. This will help with merge conflicts resolved being merging into master.
  5. When ready, tested, and containing the latest master branch in their own feature branch, developer can switch to master branch and merge their feature branch into master using the pull-request model in github.
  6. Please comment with which issue you are tackling in your feature branch name and/or the pull-request.

Clone this wiki locally