Branch based development - cma-open/cmatools GitHub Wiki

Development will follow a feature branch system. Code development begins in feature branches created from "master"/"main". These are subsequently merged back into "master"/"main" after passing code review and testing.

This workflow is described here https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow

The following branches are used:

• master (note: terminology now uses "main" for new repos)
• feature-branch

Master (main)

• This code is ready for deployment, "production" quality, and is the current best working version of the code
• Only code that is fully tested and meets appropriate code standards will be present in this branch

Feature branches

• These temporary, feature branches are created from master (main)
• These are named by issue numbers and are deleted after each solution is developed