Skip to content

Commit 03e5f91

Browse files
committed
Fixed highlighted doco error
1 parent b2a0d73 commit 03e5f91

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

docs/versioning-mode.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ For this mode we followed the logic in this blog post by Xavier Decoster on the
2020
As such we force a pre-release tag on all branches, this is fine for applications but can cause problems for libraries. As such this mode may or may not work for you, which leads us into a new mode in v4. Mainline development.
2121

2222
## Mainline development
23-
Mainline development works more like the Continuous Delivery mode, except that it tells GitVersion to *infer* releases from from event.
23+
Mainline development works more like the Continuous Delivery mode, except that it tells GitVersion to *infer* releases from merges and commits to `master`.
2424

2525
This mode is great if you do not want to tag each release because you simply deploy every commit to master. The behaviour of this mode is as follows:
2626

@@ -32,6 +32,8 @@ This mode is great if you do not want to tag each release because you simply dep
3232
1. Calculate increments for each remaining direct commit
3333
1. For feature branches then calculate increment for the commits so far on your feature branch.
3434

35+
If you *do not want* GitVersion to treat a commit or a pull request as a release and increment the version you can use `+semver: none` or `+semver: skip` in a commit message to skip incrementing for that commit.
36+
3537
Here is an example of what mainline development looks like:
3638

3739
![Mainline mode](./img/mainline-mode.png)

0 commit comments

Comments
 (0)