... | @@ -90,9 +90,10 @@ All issues ready for development, after scope approval, are on the [Development |
... | @@ -90,9 +90,10 @@ All issues ready for development, after scope approval, are on the [Development |
|
|
|
|
|
#### How we manage branches:
|
|
#### How we manage branches:
|
|
|
|
|
|
We have two main branches:
|
|
We have three main branches:
|
|
1. `develop` - the code here is less stable than the `staging` branch since it is work-in-progress.
|
|
1. `develop` - the code here is less stable than the `staging` branch since it is work-in-progress.
|
|
* Each issue is developed and tested in its own branch before being merged into `develop`.
|
|
* Each issue is developed and tested in its own branch before being merged into `develop`.
|
|
* Tested code in this branch is merged into `staging` for client reviews.
|
|
* Tested code in this branch is merged into `staging` for client reviews.
|
|
2. `staging` - the code here is stable and matches with the code of the application that the client sees.
|
|
2. `staging` - the code here is stable and matches with the code of the application that the client sees.
|
|
|
|
3. `master` - the code here is stable and will match the code of the live deployment
|
|
|
|
|