[clef-development] Fwd: change in git --> Master now the main development branch

[Schumacher M. <mar...@mu...>]

Hey everybody,

I recently announced a "change in git" on this list, merging the 'stable' branch into 'master'. This change just happened, i.e. the "master" branch is from now on the main development branch. Branching/merges should be done from/into this branch. 'stable' will become the "release branch".

Best,
Marlon

Begin forwarded message:

> From: Schumacher Marlon <mar...@mu...>
> Subject: change in git
> Date: 30 December, 2012 18:00:14 EST
> To: cle...@li...
> 
> Hey there,
> 
> As you've probably noticed much of the recent developments have been pushed to the 'stable' branch, mostly since we've been working on CLEF in the context of different classes/projects at McGill. I'm planning to make a merge/change in git:
> 
> "Stable" will be merged into (i.e. *become*) the "master" branch. From then on, "master" is going to be the main development branch. "Stable" -which should be working at all times- is going to be used for builds/distributions, e.g. for teaching purposes and projects. Changes which are specific to projects, as well as development of certain experimental features should go into dedicated branches which can eventually be merged into "master". I will also make a "Les Gestes" branch from the current "stable" branch.
> 
> So if you still have developments going on you should push them to "stable" (unless you are already using a specific branch) before I do the merge.
> 
> Cheers and Happy 2013!
> Marlon