From 9b720281bb6281cb5daa0d2a62e8c5b257c97159 Mon Sep 17 00:00:00 2001 From: Nicolas Coden Date: Sun, 21 Jan 2018 17:25:38 +0100 Subject: [PATCH] docs: improve gitflow doc in CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f6b6791d2..54e8e41c9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,8 +26,8 @@ When you submit a pull request, @mention a few people you’d like to help you r Foundation uses a git workflow close to [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/). The workflow relies on three branches: - **`master`**: The stable branch. It only contains the latest stable version released. Pull requests for docs improvements can be opened on it. -- **`develop`**: The developing branch is used to prepare the next minor/major version. It always contains all the new features and bug fixes previously made, and constitutes the most up-to-date version of Foundation. Almost every pull request should be opened on this branch. When a new version is released, it is merged on `master`, a support branch is created, and `develop` now targets the next version. -- **`support/*`**: Support branches are used to support the previous versions (i.e. `support/6.3` for `v6.3.0`) and prepare patches (i.e. `v6.3.1`). When a bug fix is compatible with supported versions, it is also merged on their support branches and patch versions can be released. If a fix is not compatible with `develop`, a pull request can be opened on the latest compatible and supported version. +- **`develop`**: The developing branch is used to prepare the next minor/major version. It always contains all the new features and bug fixes, and is the most up-to-date version of Foundation. Almost every pull request should be opened on this branch. When a new version is released, it is merged on `master`, a support branch is created, and `develop` now targets the next version. +- **`support/*`**: Support branches are used to support the previous versions (i.e. `support/v6.4` for `v6.4.0`) and prepare patches (i.e. `v6.4.1`). When a pull request for a bug fix is merged on `develop` and is compatible with supported versions, its commits must be added on the compatible `support/*` branches too. A patch version can be then released. If a fix is not compatible with `develop`, a pull request can be opened on the latest compatible and supported `support/*` branch. This git workflow was adopted as of `v6.3`, so `v6.2` and previous versions are not supported. -- 2.47.2