On Wed, Sep 5, 2012 at 8:56 PM, Hartmut Goebel <h.goebel@crazy-compilers.com> wrote:
xkilina wrot in https://github.com/naparuba/shinken/pull/567:

> Well, we should aim to have everything ready by friday. So come monday
morning, new users can download 1.2.1 and get cooking. After that 1.2.2
for whatever comes out of next week or the two weeks after that…

> Which is why we need to have the discussion about stable versus dev.

Here is my opinion:

First of all you need to decide whether then 1.2.x-releases should be
bug-fixes only or also contain other changes.

After this I recommend having a look at
<http://nvie.com/posts/a-successful-git-branching-model/>. I have
learned a lot of it and am using this model for my projects. I recommend
using this model (or a slightly adopted version).


Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
Shinken-devel mailing list