Skip to content

Update mainline-development.md #1133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 11, 2017
Merged

Update mainline-development.md #1133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/reference/mainline-development.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ and the version number which will be deployed are often different.
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:

1. Calclate a base version (likely a tag in this mode)
1. Calculate a base version (likely a tag in this mode)
2. Walk all commits from the base version commit
3. When a merge commit is found:
- Calculate increments for each direct commit on master
Expand Down Expand Up @@ -54,4 +54,4 @@ change the [configuration](../configuration.md) as such:

```yaml
mode: Mainline
```
```