@@ -20,3 +23,4 @@ All new code/features/bug-fixes should be created on their own branch, e.g.:
...
@@ -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.
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.