|
|
# Code Development
|
|
|
|
|
|
## Repository Structure
|
|
|
There are 3 main branches
|
|
|
- master: always 'runnable' code, e.g. could be used by customers
|
|
|
There are 4 main branches
|
|
|
- release: latest code release
|
|
|
- master: code updates since the last release, should always be runnable/stable code, e.g. could be used in production
|
|
|
- develop: current developments, waiting to be pushed into the master
|
|
|
- foundation: mirror of the latest Foundation master branch merged from upstream
|
|
|
|
|
|
## Worfflow
|
|
|
## Workflow
|
|
|
Create a tracking branch to track the 'develop' branch if not already available:
|
|
|
- git branch develop --track remotes/origin/develop
|
|
|
|
... | ... | |