File tree Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -56,12 +56,14 @@ All wrappers and OSP-core are part of a common directory structure:
5656```
5757- Once the features for a release have been reached, ` dev ` will be merged to
5858 ` master/main ` . Every new commit in the ` master/main ` branch generally corresponds
59- a new release. An exception to this rule may apply, for example when several
60- critical hotfixes are applied in a row, as it would then be better to just to
61- publish a single release afterwards.
62-
63- In the next image it can be seen how the branches usually look during this
64- workflow, and the different commits used to synchronise them:
59+ to a new release, which is labeled with a
60+ [ git tag] ( https://git-scm.com/book/en/v2/Git-Basics-Tagging ) matching its
61+ version number. An exception to this rule may apply, for example when several
62+ critical hotfixes are applied in a row, as it would then be better to just to
63+ publish a single release afterwards. In regard to version numbering, we adhere to the
64+ [ _ Semantic versioning_ ] ( https://semver.org/ ) rules.
65+
66+ In the next image it can be seen how the branches usually look during this workflow, and the different commits used to synchronise them:
6567
6668<figure style =" display : table ; text-align :center ; margin-left : auto ; margin-right :auto " >
6769
You can’t perform that action at this time.
0 commit comments