diff options
| author | luz paz <luzpaz@github.com> | 2022-05-31 15:17:36 -0400 |
|---|---|---|
| committer | Riku Isokoski <riksu9000@gmail.com> | 2022-06-05 09:31:23 +0300 |
| commit | 03a510bd182cdb89005d75e0f8dacf734efce315 (patch) | |
| tree | 581d6638c06a2211c2d154e69cf66d702e1de818 /doc/branches.md | |
| parent | 7f45538eb53235ab4015fcf13533796c8759c7bc (diff) | |
Fix various typos
Found via `codespell -q 3 -S ./src/libs -L ans,doubleclick,trough`
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 3c86375f..c12c764a 100644 --- a/doc/branches.md +++ b/doc/branches.md @@ -5,7 +5,7 @@ The project is based on 2 main branches: - **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. +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 successfully reviewed and accepted. To release a new version of the application, when develop is considered stable, a **release** branch is created from **develop**. This can be considered as a *release candidate* branch. When everything is OK, this release branch is merged into **master** and the release is generated (a tag is applied to git, the release note is finalized, binaries are built,...) from **master**. |