... | ... | @@ -7,6 +7,9 @@ There are 3 main branches |
|
|
- foundation: mirror of the Foundation master branch
|
|
|
|
|
|
## Operation
|
|
|
Create a tracking branch to track the 'develop' branch:
|
|
|
- git b develop --track remotes/origin/develop
|
|
|
|
|
|
All new code/features/bug-fixes should be created on their own branch, e.g.:
|
|
|
- git checkout develop
|
|
|
- git checkout -b feature-ABC (or git checkout -b bugfix-ABC etc)
|
... | ... | @@ -20,3 +23,4 @@ All new code/features/bug-fixes should be created on their own branch, e.g.: |
|
|
|
|
|
Periodically when code in the 'develop' branch is stable, merge the develop branch into the 'master' branch. Similarly, the 'develop' branch will be updated from the 'foundation' branch.
|
|
|
|
|
|
For code review (as needed) push your feature/bugfix branch to Gitlab, and issue a merge request into the 'develop' branch. |