pheerai/pizza
0
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch '05_version_to_contrib' into 'master'

Browse source 
05 Version To Contrib

Closes #5

As described in #2 and #5 added Version info to CONTRIB.md
This commit is contained in:
Oliver Rümpelein 2015-01-15 11:31:33 +01:00
commit 677cabfc09
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CONTRIB.md
View file

@ -19,5 +19,9 @@ Do things like rebase and stash only if you're absolutely sure what you're doing
## Early Merge-Requests ## Early Merge-Requests
If you think you're not completely done yet, or if you are stuck at some point: do a merge-request. Merge-Requests are discussions about work, no presentation for the result. If you think you're not completely done yet, or if you are stuck at some point: do a merge-request. Merge-Requests are discussions about work, no presentation for the result.
## Versioning
Versioning is done by pheerai when merging into release. It is done the following way: v<major>.<minor>.<bugfix>
The steps needed for major-releases can be found in the roadmap, minor versions change when one of the major-features gets added before a master release.
[1]: http://www.git-scm.com/book/en/v2 [1]: http://www.git-scm.com/book/en/v2
[2]: https://about.gitlab.com/2014/09/29/gitlab-flow/ [2]: https://about.gitlab.com/2014/09/29/gitlab-flow/