diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
| commit | ada2c09581d2d13acfa5ce9a97671c0ec17863f1 (patch) | |
| tree | 2f776adc59d0c63e403d2043cb8460e65d6c46fe /doc/versioning.md | |
| parent | 18cff286c75f432095db4b188e0f9a8a9e2bd8e8 (diff) | |
| parent | c9a5c3fa5c930a5939d3114a6c6b48570d61ca24 (diff) | |
Merge branch 'develop' into infineat-external-resources
# Conflicts:
# src/displayapp/screens/Symbols.h
# src/displayapp/screens/settings/SettingWatchFace.cpp
# src/displayapp/screens/settings/SettingWatchFace.h
Diffstat (limited to 'doc/versioning.md')
| -rw-r--r-- | doc/versioning.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/versioning.md b/doc/versioning.md index 2fa36ab9..28ca085c 100644 --- a/doc/versioning.md +++ b/doc/versioning.md @@ -1,6 +1,7 @@ # Versioning + The versioning of this project is based on [Semantic versioning](https://semver.org/): - - The **patch** is incremented when a bug is fixed on a **released** version (most of the time using a **hotfix** branch). - - The **minor** is incremented when a new version with new features is released. It corresponds to a merge of **develop** into **master**. - - The **major** should be incremented when a breaking change is made to the application. We still have to define what is a breaking change in the context of this project. +- The **patch** is incremented when a bug is fixed on a **released** version (most of the time using a **hotfix** branch). +- The **minor** is incremented when a new version with new features is released. It corresponds to a merge of **develop** into **master**. +- The **major** should be incremented when a breaking change is made to the application. We still have to define what is a breaking change in the context of this project. |