|
a/CONTRIBUTING |
|
b/CONTRIBUTING |
|
... |
|
... |
| 148 |
|
148 |
|
| 149 |
'dev' will always contain 'master'. Emergency fixes may go directly to
|
149 |
'dev' will always contain 'master'. Emergency fixes may go directly to
|
| 150 |
'master' which would then immediately be merged down into 'dev'.
|
150 |
'master' which would then immediately be merged down into 'dev'.
|
| 151 |
|
151 |
|
| 152 |
As we get more contributors and start having "patch-churn", we will
|
152 |
As we get more contributors and start having "patch-churn", we will
|
| 153 |
re-evaluate a three-branch model, like Git. The third branch would be
|
153 |
re-evaluate a three-branch model, like Git. The third branch would be
|
| 154 |
'pu' (for "proposed update").
|
154 |
'pu' (for "proposed update").
|
| 155 |
|
155 |
|
| 156 |
We expect that people deploying the code will deploy from 'master' or
|
156 |
We expect that people deploying the code will deploy from 'master' or
|
| 157 |
from a release tag. We expect that people experimenting with the code
|
157 |
from a release tag. We expect that people experimenting with the code
|
| 158 |
will deploy from 'dev' or from their own feature branches or integration
|
158 |
will deploy from 'dev' or from their own feature branches or integration
|