[dev] Git branch naming

[Michael M Slusarz]

Quoting Michael M Slusarz <slusarz at horde.org>:

> 1. WE NEED TO GET RID OF THE develop BRANCH

[snip]

> Instead of explaining why I think our old setup is bogus, I will  
> instead describe what I think we should be using instead:
>
>   + The release of Horde 5.0 should be immediately branched into HORDE_5.
>   + 'master' again becomes the HEAD branch.
>     - For now, 'master' should be thought of as what will eventually  
> become Horde 5.1
>     - *ALL* developers should be using 'master' going forward
>   + Bugs discovered on master need to be backported (i.e.  
> cherry-picked) into the HORDE_5 branch.
>     - We should *NEVER* be merging (i.e. 'git merge') to/from  
> branches for release versions.

Bumping this discussion now that Horde 5 is released.

michael

___________________________________
Michael Slusarz [slusarz at horde.org]