Branches¶
The main
branch is always compiling and all tests should go through.
It contains the most recent improvements.
All other branches are real development branches and might event not compile.
There are no explicit branches for stable versions as winery is currently in development-only mode.
We try to follow following naming conventions:
Bugfix:
fix/issue-NNN
orfix/SHORT-TITLE
if fixing an issue with a number or give it a titleFeature:
feature/issue-NNN
orfeature/SHORT-TITLE
WIP:
wip/SHORT-TITLE
for ‘work in progress’ without an issue and you know won’t be finished soonThesis:
thesis/SHORT-THESIS-TITLE
, replaceSHORT-THESIS-TITLE
with something meaningfulEnPro: prefix
fix
,feature
,wip
(see below) withenpro/
StuPro: prefix
fix
,feature
,wip
(see below) withstupro/
See https://gist.github.com/revett/88ee5abf5a9a097b4c88 for a discussion and other ideas.