github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 01:13:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix typo and add branching examples in CONTRIBUTING.md.

Browse source
This commit is contained in:
CJ Cenizal 2016-11-07 09:46:33 -08:00
parent d42dd74668
commit d28e9cea58
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CONTRIBUTING.md
View file

@ -74,10 +74,10 @@ We enjoy working with contributors to get their code accepted. There are many ap
### Branching
* All work on the next major release goes into master.
* Past major release branches are named `{majorVersion}.x`. They contain work that will go into the next minor release.
* Past minor release branches are named `{majorVersion}.{minorVersion}`. They contain work that will go into the next patch release.
* Past major release branches are named `{majorVersion}.x`. They contain work that will go into the next minor release. For example, if the next minor release is `5.2.0`, work for it should go into the `5.x` branch.
* Past minor release branches are named `{majorVersion}.{minorVersion}`. They contain work that will go into the next patch release. For example, if the next patch release is `5.3.1`, work for it should go into the `5.3` branch.
* All work is done on feature branches and merged into one of these branches.
* Where appropriate, we'll backport changes into older release branche.
* Where appropriate, we'll backport changes into older release branches.
### Commits and Merging