17/12 2013
Git branching strategy

A new strategy for our git branches - aiming to produce more frequent releases and a public beta space.

Dear developers,

our family of extensions has been enhanced in so many ways during the last months that it has become hard to keep track of the changes and new features involved. In addition some compatibility breaks between TER and GIT versions were inevitable due to conceptual shifts and potentially could lead to confusion and/or frustration for those eager to try out the new stuff. To address those issues and of course to improve maintainability we decided to introduce an established branching model.

Meet Git flow (optimised for TER sync)

We're going to have three branches for each extension: 'development', 'staging' and 'master':

New features or conceptual changes will first be done in the 'development' branch. This can be seen as bleeding edge and chances are not too little it may break your stuff in some way so you should be aware of that.

When it's time for a new feature to go into the next release it will first be merged into the 'staging' branch for everyone willing to try it in their individual setups. You can consider this branch the beta version of an upcoming release for us to gather your feedback and to retouch the code. Of course, code that reaches staging will be well tested and measures will be taken to make it either not break stuff or you will get informed about possible breakage.

Finally when the dust has settled and the new feature is proven to be bugfree it will be merged into 'master', tagged and released to TER making 'master' the stable branch. Newly added tags for releases will then be applied to 'staging' and 'development' as well of course to keep everything in sync.

Last but not least bugfixes are applied to the 'staging' branch and get merged into 'master' for a sooner or later bugfix release depending on the severity of the bug.

What will happen next?

flux is the first extension to move to the new branching model and an exceptional case right away: the current release is quite far behind the development version but we'd like to maintain that for some more time so there is one more staging branch named 'legacy' for upcoming 6.0.3 and 'staging' for the all new and shiny 7.0.0 which is planned to be released along with TYPO3 6.2 LTS.

To whom it may concern: Those brave folks working with the current masters should of course prepare to switch to the development branch anytime soon.

We are sure this new model will increase the frequency of releases and simplify the testing of new features with the least possible chance of breaking stuff.

Cheers,
Björn

 

Archive

09/01 2017
09/11 2016
09/06 2016
21/12 2015
07/12 2015
25/11 2015
25/09 2015
22/09 2015
01/08 2015
10/03 2015
03/03 2015
12/02 2015
25/11 2014
01/11 2014
16/10 2014
02/10 2014
02/10 2014
19/09 2014
18/09 2014
05/09 2014
22/08 2014
02/08 2014
27/06 2014
06/06 2014
13/04 2014
27/03 2014
12/03 2014
11/03 2014
05/02 2014
25/01 2014
17/12 2013
08/12 2013
03/12 2013
04/11 2013
Flux 7.0 Teaser
06/08 2013
21/07 2013
10/06 2013
04/06 2013
01/06 2013
27/05 2013
19/05 2013
19/05 2013
11/05 2013
26/04 2013
30/03 2013
19/03 2013
17/03 2013
13/03 2013
10/03 2013
10/03 2013
05/03 2013
04/03 2013
03/03 2013
02/03 2013
01/03 2013
28/02 2013
27/02 2013
25/02 2013
24/02 2013
24/02 2013
23/02 2013
10/02 2013
03/02 2013
03/02 2013
27/01 2013
Asset management in Fluid
20/01 2013
16/01 2013
13/01 2013
08/01 2013
16/12 2012
25/11 2012
18/11 2012
08/11 2012
07/11 2012
05/11 2012
04/11 2012
28/10 2012
22/10 2012
14/10 2012
13/08 2012
08/08 2012
31/07 2012
30/07 2012
25/07 2012
29/04 2012
29/04 2012
22/04 2012
16/04 2012
21/03 2012
Flux 1.4.0 released
08/03 2012
Flux 1.3.0 released
04/03 2012
03/03 2012
28/02 2012
19/02 2012
A Sneaky Sneak Preview of the next version of Flux
13/02 2012
12/02 2012
06/02 2012
30/01 2012
27/01 2012
15/01 2012
26/12 2011
24/12 2011
11/12 2011
11/12 2011
10/12 2011
04/12 2011
04/12 2011
30/11 2011
26/11 2011
25/11 2011