diff options
| author | JF <jf@codingfield.com> | 2021-09-02 18:35:56 (GMT) |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2021-09-02 18:35:56 (GMT) |
| commit | 6c3d6fb2575888e582e7ef3004a0bc3bf6c588b6 (patch) | |
| tree | ac396c060b423dd98fd915e742c14fc457a6f6d9 /doc/branches.md | |
| parent | db6a701644116932f11c54ee0f619464de9faeb7 (diff) | |
| parent | 6f9f0e8b0e42a5526d47ca664534fb6b0ccb6ace (diff) | |
Merge branch 'develop' of JF/PineTime into master
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. |