diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2021-07-25 17:01:09 (GMT) |
|---|---|---|
| committer | Riku Isokoski <riksu9000@gmail.com> | 2021-07-25 17:01:09 (GMT) |
| commit | a1ba187c47ddad932fc38247d969bb9888860698 (patch) | |
| tree | 6479d302c81fc8e9700854b1682542cdc9c4b6ea /doc/branches.md | |
| parent | e4d9636e8258c25efbd79d26a8167b17fe7252c8 (diff) | |
| parent | 7b75ca591d31ccd8883a1a1ff83cfd271959dbaa (diff) | |
Merge branch 'develop' into new_touch_handler
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. |