You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/Usage/Workflow.md
+10-13Lines changed: 10 additions & 13 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -33,19 +33,16 @@ Git2SemVer stops walking Git commits when it reaches a (release tags)[xref:relea
33
33
34
34
An example workflow:
35
35
36
-
| Step | Resulting build version |
37
-
|:-- |:-- |
38
-
| Starts at a release (`1.2.3`) marked by tag `v1.2.3`. | 1.2.3 |
39
-
| Then a build on without API changes | 1.2.4 as a released version may not be reused. See [Semver spec, item 6](<see href="https://semver.org/#spec-item-6">)
40
-
| Then, in a developer branch fixes 2 bugs (e.g: [conventional commit](https://www.conventionalcommits.org/en/v1.0.0/)`fix:bug1`). | Remains at 1.2.4 the patch number has already been bumped. Note that [Semver spec, item 6](https://semver.org/#spec-item-6) refers to "fixes" (plural). |
41
-
| Then, adds a feature. | 1.3.0 as a feature added since last release. |
42
-
| Then, fixes another bug. | Features trump bugs. See [Semver spec, item 7](https://semver.org/#spec-item-7)|
43
-
| Then, the work is merged back to a feature branch and then the main branch and this build is released (commit is tagged with used version). | 1.3.0 |
44
-
45
-
Build versions are .
46
-
47
-
Worklow git diagram showing build version and, where applicable, [conventional commit](https://www.conventionalcommits.org/en/v1.0.0/) git message
48
-
elements:
36
+
| Step | Action | Version | Explanation |
37
+
| :--: |:-- | :--: |:-- |
38
+
|①| Start at a release (`1.2.3`) marked by tag `v1.2.3`. |**1.2.3**| The tag defines this commit as the released version 1.2.3. The versioning release cycle starts from a tagget release. |
39
+
| ② | A commit without API changes | 1.2.4 | Bumped as a released version may not be reused. See [Semver spec, item 6](<see href="https://semver.org/#spec-item-6">)
40
+
|③| In a developer branch fix 2 bugs (e.g: [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/)`fix:bug1` and `fix:bug2`). | 1.2.4 | No change as the patch number has already been bumped. Note: [Semver spec, item 6](https://semver.org/#spec-item-6) refers to "fixes" (plural). |
41
+
|④| Add a feature `feat:x`. | 1.3.0 | See [Semver item 7](https://semver.org/spec/v2.0.0.html#spec-item-7)|
42
+
|⑤| Fix another bug `fix:bug3`. | 1.3.0 | See [Semver spec, item 7](https://semver.org/#spec-item-7). It is about changes between releases, not order of changes. |
43
+
|⑥| Merge the work to a feature branch and then the main branch and this build is released (commit is tagged with used version). |**1.3.0**| A release, the versioning release cycle starts again. |
0 commit comments