-
Notifications
You must be signed in to change notification settings - Fork 23
Branching Guidelines
jklmnn edited this page Sep 19, 2015
·
1 revision
#Branching Guidelines
These guidelines are supposed to help keeping a structure in development and prevent dead branches and redundant work.
##Branches ###master
- This is the current stable release.
- Pull requests are only accepted if they fix bugs.
- The only exception is a major upgrade. Then devel will be merged into master.
- Changes made here must also be applied to devel, except they are fixed/changed otherwise in devel.
###devel
- This is the next major release.
- New functionalities and APIs can be merged here.
- This branch is forked again from master after merging a major upgrade.
###General/other branches
- Equal branches have to be merged together.
- Branches that cannot be merged into master/devel, depending on their changes, must be deleted or recreated.