[dev] [commits] Horde branch mnemo_4_1 updated. 7324877f91d83f8de26d41ba7ca05be559255994

[Michael J Rubinsky]

Quoting Ralf Lang <lang at b1-systems.de>:

>> Looking at current Github dashboard page made me finally realise
>> that splitting every application and every library into separate
>> repositories is a way to go (the opposite I thought a year ago). It
>> is starting to be confusing to see all those branches and thousands
>> of tags in one repository even though I need only couple of
>> libraries and two application from it.
>>
>> Also I totally agree with Michael M for making master a HEAD branch
>> and branching x.1 branches starting with alpha (or beta) step in a
>> release cycle.
>>
>
> I'm currently puzzled what type of code (bugfix, enhancement,
> pre-release apps) to put where and I cannot tell Karim if he asks me.

For the record, master is the current state of the stable code - where  
new bug fix releases are built from. As such, bugfixes go in master.  
New features go in a x.1 branch for the app/library involved. These  
x.1 branches are kept up to date with master by merging master into  
them so that the diff compared to master contains only the new features.

-- 
mike

The Horde Project (www.horde.org)
mrubinsk at horde.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 6062 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.horde.org/archives/dev/attachments/20130327/5def9c06/attachment-0001.bin>