Changeset - 9d30314e5dd7
[Not reviewed]
dev
0 1 0
Dennis Fink - 9 years ago 2016-02-27 12:45:45
dennis.fink@c3l.lu
Corrected named branches in README.rst
1 file changed with 1 insertions and 1 deletions:
0 comments (0 inline, 0 general)
README.rst
Show inline comments
 
@@ -45,25 +45,25 @@ Repository
 

	
 
.. _Branch Structure:
 

	
 
Branch Structure
 
++++++++++++++++
 

	
 
The branch structure of this project is very similiar to the `git-flow`_
 
branching model, but with some modifications (we don't have release branches).
 

	
 
Description of the branches:
 

	
 
- **default**: This is the stable branch.
 
- **stable**: This is the main development branch.
 
- **dev**: This is the main development branch.
 
- **hotfix-***: These branches branch off from the default branch and are used to
 
  fix bugs which are in the stable version. They will be merged back into
 
  *default* and *dev*. After the bug is fixed, the *PATCH* number must be
 
  increased!
 
- **feature-***: In these branches, we will implement new features. These will
 
  branch off from the *dev* branch and merged back into the *dev* branch, if
 
  the feature is completed!
 

	
 
.. _Semantic Versioning: http://semver.org/
 
.. _git-flow: http://nvie.com/posts/a-successful-git-branching-model/
 

	
 
.. _Feature Requests:
0 comments (0 inline, 0 general)