diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2d03f2bdb..a6c61882a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,26 +52,26 @@ Here are the branches we use and their meaning : For example, if no version is currently prepared for shipping we could have: -- `develop` containing future 3.0.0 version +- `develop` containing future 3.1.0 version +- `support/3.0`: 3.0.x maintenance version - `support/2.7`: 2.7.x maintenance version - `support/2.6`: 2.6.x maintenance version -- `support/2.5`: 2.5.x maintenance version -In this example, when 3.0.0-beta is shipped that will become: +In this example, when 3.1.0-beta is shipped that will become: -- `develop`: future 3.1.0 version -- `release/3.0.0`: 3.0.0-beta +- `develop`: future 3.2.0 version +- `release/3.1.0`: 3.1.0-beta +- `support/3.0`: 3.0.x maintenance version - `support/2.7`: 2.7.x maintenance version - `support/2.6`: 2.6.x maintenance version -- `support/2.5`: 2.5.x maintenance version And when 3.0.0 final will be out: -- `develop`: future 3.1.0 version -- `support/3.0`: 3.0.x maintenance version (will host developments for 3.0.1) +- `develop`: future 3.2.0 version +- `support/3.1`: 3.1.x maintenance version (will host developments for 3.1.1) +- `support/3.0`: 3.0.x maintenance version - `support/2.7`: 2.7.x maintenance version - `support/2.6`: 2.6.x maintenance version -- `support/2.5`: 2.5.x maintenance version Also note that we have a "micro-version" concept : each of those versions have a very small amount of modifications. They are made from `support/*` branches as well. For example 2.6.2-1 and 2.6.2-2 were made from the `support/2.6.2` branch.