diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2021-08-17 12:35:29 (GMT) |
|---|---|---|
| committer | Riku Isokoski <riksu9000@gmail.com> | 2021-08-17 12:35:29 (GMT) |
| commit | 5b969ccfa975632606aa0b3dc8165460effb9cc3 (patch) | |
| tree | 38cb0686dd51b5d627ee597a07352e291a004749 /doc/branches.md | |
| parent | 7ac6bdfe71f10dd4388da6d3fd29650b072f71f7 (diff) | |
| parent | ee44b6ff4998d6f4d0672c05c1f65c0a9692dc0d (diff) | |
Merge branch 'develop' into update_touch_driver
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 0fb8316..ef280f4 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. |