... | @@ -4,7 +4,18 @@ We have stable production branches (currently 11.0, 12.0). Merging changes direc |
... | @@ -4,7 +4,18 @@ We have stable production branches (currently 11.0, 12.0). Merging changes direc |
|
|
|
|
|
Development process happens on the development branches (named `11.0-<branch name>`, `12.0-<branch name>` where `<branch name>` is a description of features developers work on).
|
|
Development process happens on the development branches (named `11.0-<branch name>`, `12.0-<branch name>` where `<branch name>` is a description of features developers work on).
|
|
|
|
|
|
### Code Testing Process
|
|
New feature development example:
|
|
|
|
|
|
|
|
`git checkout -b 11.0-new-feature` - this will create and checkout a new branch `11.0-new-feature`
|
|
|
|
|
|
|
|
After some changes made:
|
|
|
|
|
|
|
|
`git push -u origin 11.0-new-feature` - set upstream and push the changes to Gitlab
|
|
|
|
|
|
|
|
Automatic tests for pushed changes will start.
|
|
|
|
Now developer goes to Gitlab and checkout if the tests are passed.
|
|
|
|
|
|
|
|
### Code Control
|
|
|
|
|
|
Any code changes should pass the following stages to be merged into the main branch:
|
|
Any code changes should pass the following stages to be merged into the main branch:
|
|
|
|
|
... | | ... | |