Git Flow
From GLMWiki
Branches:
master => used for production code only
develop => used for developing new features (never ending)
hotfix => used for maintenance (get merged into master and develop once done)
release => used for creating new releases of code from the develop branch (merges back into master and develop)
