From 51cace6c8a92285c7283f6db0163833658d73ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Thu, 15 Jan 2015 11:28:55 +0100 Subject: [PATCH] Added Versioning info to CONTRIB.md --- CONTRIB.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CONTRIB.md b/CONTRIB.md index 997c0c9..87d1285 100644 --- a/CONTRIB.md +++ b/CONTRIB.md @@ -19,5 +19,9 @@ Do things like rebase and stash only if you're absolutely sure what you're doing ## 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. +## Versioning +Versioning is done by pheerai when merging into release. It is done the following way: v.. +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 -[2]: https://about.gitlab.com/2014/09/29/gitlab-flow/ \ No newline at end of file +[2]: https://about.gitlab.com/2014/09/29/gitlab-flow/