From: harry Date: Sun, 29 Jan 2017 12:41:29 +0000 (+0530) Subject: Grammar correcting within CONTRIBUTING.md X-Git-Tag: 6.3.1~19^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9720%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Grammar correcting within CONTRIBUTING.md --- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 15ecea605..f6b6791d2 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 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 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 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. This git workflow was adopted as of `v6.3`, so `v6.2` and previous versions are not supported.