-
Notifications
You must be signed in to change notification settings - Fork 1
Branching Model
This article is WIP, please discuss at issue #520.
This is the branching model for Bumblebee developpement. Please read this.
This branch is the most stable one, from here are branching off every other branches.
May branch off from: master
Must merge back into: master, develop
Branch naming convention: hotfix-*
Such branches are intended to fix as fast as possible issues in the master branch.
May branch off from: develop
Must merge back into: master, develop
Branch naming convention: release-*
Such branches are for testing new versions before releasing them. We may create a beta package building bumblebee from here.
Permanent branch. Initially branched off from master.
This is the branch that receive all the new features that are implemented. The dev package is building from this branch.
May branch off from: develop
Must merge back into: develop
Branch naming convention: common-feature_name
Such branches contain new features for which implementation is in progress and that are common for all distros.
May branch off from: develop
Must merge back into: develop
Branch naming convention: distro-feature_name
Such branches contain new features for which implementation is in progress and that are specific to the distro. It includes as well feature that have been implemented for others distro and are being implemented for this as feature that are really specific to the distro (such as using a distro tools for doing something particular).
distro should be replaced by distro name (ex: Ubuntu, Fedora, ...).
#About the "to_clean" branch
This branch is a temporary one created for the BIG CLEAN purposes. It will be deleted when everything in it will be no longer needed. Please don't make any changes to this branch.