diff options
| author | JF <jf@codingfield.com> | 2020-07-27 21:25:00 +0200 |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-07-27 21:25:00 +0200 |
| commit | 71e8c320b03ea6ee302baa0035e08dc7fb657174 (patch) | |
| tree | fbece0d6c1e0980c8d17237aec4a1d43c8afe3e4 /doc/branches.md | |
| parent | c04d22ee0ac20c64a389c10d98f1c2417d788e13 (diff) | |
| parent | 8c77c8631de753a4c32bc7c79a22a1452b37f3f6 (diff) | |
Merge branch 'develop' of git.proxmox3:JF/PineTime into develop
# Conflicts:
# README.md
Diffstat (limited to 'doc/branches.md')
| -rw-r--r-- | doc/branches.md | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/branches.md b/doc/branches.md new file mode 100644 index 00000000..0fb8316d --- /dev/null +++ b/doc/branches.md @@ -0,0 +1,12 @@ +# Branches +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. + - **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. + +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**. + +Git flow also supports the creation of **hotfix** branches when a bug is discovered in a released version. The **hotfix** branch is created from **master** and will be used only to implement a fix to this bug. Multiple hotfix branches can be created for the same release if more than one bugs are discovered.
\ No newline at end of file |