diff options
| author | Kieran Cawthray <kieranc@gmail.com> | 2021-07-28 16:07:43 +0200 |
|---|---|---|
| committer | Kieran Cawthray <kieranc@gmail.com> | 2021-07-28 16:07:43 +0200 |
| commit | 12aeb4688923a06d574b7aa7262626e7eab5b7f1 (patch) | |
| tree | e626b0e55e4144e6928632b17bada38b2aaade7d /doc/branches.md | |
| parent | e6bc485679022c51486ac3a28b8473b95ff0d115 (diff) | |
| parent | 514481ef7f9c71ad816b31d979c6ab39ce9380dd (diff) | |
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
Diffstat (limited to 'doc/branches.md')
| -rw-r--r-- | doc/branches.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/branches.md b/doc/branches.md index 0fb8316d..ef280f40 100644 --- a/doc/branches.md +++ b/doc/branches.md @@ -2,7 +2,7 @@ The branching model of this project is based on the workflow named [Git flow](https://nvie.com/posts/a-successful-git-branching-model/). It is based on 2 main branches: - - **master** : this branch is always ready to be reployed. It means that at any time, we should be able to build the branch and release a new version of the application. + - **master** : this branch is always ready to be deployed. It means that at any time, we should be able to build the branch and release a new version of the application. - **develop** : this branch contains the latest development that will be integrated in the next release once it's considered as stable. New features should be implemented in **feature branches** created from **develop**. When the feature is ready, a pull-request is created and it'll be merge into **develop** when it is succesfully reviewed and accepted. |