Skip to content

Commit 1f29d1f

Browse files
committed
Small formatting change
1 parent 14ffad9 commit 1f29d1f

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

README.md

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@ You are seeing:
1818

1919
At each commit sha GitVersion will calculate:
2020

21-
- e137e9 - 1.0.0+0
22-
- a5f6c5 - 1.0.1+1
23-
- adb29a - 1.0.1-feature-foo.1+1 (PR #5 Version: `1.0.1-PullRequest.5+2`)
24-
- 7c2438 - 1.0.1-feature-foo.1+2 (PR #5 Version: `1.0.1-PullRequest.5+3`)
25-
- 5f413b - 1.0.1+4
26-
- d6155b - 2.0.0-rc.1+0 (Before and after tag)
27-
- d53ab6 - 2.0.0-rc.2+1 (Pre-release number was bumped because of the tag on previous commit)
28-
- b5d142 - 2.0.0+0 (2.0.0 branch was merged, so master is now at 2.0.0)
21+
```
22+
e137e9 -> 1.0.0+0
23+
a5f6c5 -> 1.0.1+1
24+
adb29a -> 1.0.1-feature-foo.1+1 (PR #5 Version: `1.0.1-PullRequest.5+2`)
25+
7c2438 -> 1.0.1-feature-foo.1+2 (PR #5 Version: `1.0.1-PullRequest.5+3`)
26+
5f413b -> 1.0.1+4
27+
d6155b -> 2.0.0-rc.1+0 (Before and after tag)
28+
d53ab6 -> 2.0.0-rc.2+1 (Pre-release number was bumped because of the tag on previous commit)
29+
b5d142 -> 2.0.0+0 (2.0.0 branch was merged, so master is now at 2.0.0)
30+
```
2931

3032
This is just a small sample of the way GitVersion works. The idea is you just plug it in and you will get sensible version numbers by default. We support the following branch types ootb:
3133

@@ -51,14 +53,16 @@ If you want to consume packages from you CI server, for instance Octopus Deploy
5153
When using the continuous deployment mode all builds *must* have a pre-release tag, except for builds which are explicitly tagged as stable.
5254
Then the build metadata (which is the commit count) is promoted to the pre-release tag. Applying those rules the above commit graph would produce:
5355

54-
- e137e9 - 1.0.0+0
55-
- a5f6c5 - 1.0.1-ci.1
56-
- adb29a - 1.0.1-feature-foo.1 (PR #5 Version: `1.0.1-PullRequest.5+2`)
57-
- 7c2438 - 1.0.1-feature-foo.2 (PR #5 Version: `1.0.1-PullRequest.5+3`)
58-
- 5f413b - 1.0.1-ci.4
59-
- d6155b - 2.0.0-rc.1+4 (Before and after tag)
60-
- d53ab6 - 2.0.0-rc.2 (If there was another commit on the release branch it would be 2.0.0-rc.3)
61-
- b5d142 - 2.0.0-ci.0 (2.0.0 branch was merged, so master is now at 2.0.0)
56+
```
57+
e137e9 -> 1.0.0+0
58+
a5f6c5 -> 1.0.1-ci.1
59+
adb29a -> 1.0.1-feature-foo.1 (PR #5 Version: `1.0.1-PullRequest.5+2`)
60+
7c2438 -> 1.0.1-feature-foo.2 (PR #5 Version: `1.0.1-PullRequest.5+3`)
61+
5f413b -> 1.0.1-ci.4
62+
d6155b -> 2.0.0-rc.1+4 (Before and after tag)
63+
d53ab6 -> 2.0.0-rc.2 (If there was another commit on the release branch it would be 2.0.0-rc.3)
64+
b5d142 -> 2.0.0-ci.0 (2.0.0 branch was merged, so master is now at 2.0.0)
65+
```
6266

6367
As you can see the versions now no longer conflict. When you want to create a stable `2.0.0` release you simply `git tag 2.0.0` then build the tag and it will produce a stable 2.0.0 package.
6468

0 commit comments

Comments
 (0)