diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e9991d32b..ddf3e4ccd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,16 +41,16 @@ If you want to use another license, you may [create an extension][wiki new ext]. When we first start with Git, we were using the [GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) branch model. As there was some confusions about branches to use for current developed release and previous maintained release, and also because we were - using just a very few of the GitFlow commands, we decided to add just a little modification to this branch model : we now have no - `support` branch. + using just a very few of the GitFlow commands, we decided to add just a little modification to this branch model : since april 2020 + we don't have anymore a `master` branch. Here are the branches we use and their meaning : - `develop`: ongoing development version -- `release/\*`: if present, that means we are working on a beta version +- `release/\*`: if present, that means we are working on a alpha/beta/rc version for shipping - `support/\*`: maintenance branches for older versions -For example, if no beta version is currently ongoing we could have: +For example, if no version is currently prepared for shipping we could have: - `develop` containing future 2.8.0 version - `support/2.7`: 2.7.x maintenance version