From kde-active  Fri Jun 10 20:36:45 2011
From: ivan.cukic () kde ! org (Ivan Cukic)
Date: Fri, 10 Jun 2011 20:36:45 +0000
To: kde-active
Subject: Share, like, connect
Message-Id: <2081350.c6eUphYlEZ () drako>
X-MARC-Message: https://marc.info/?l=kde-active&m=131631769322090


> * a master that now is frozen,
> * branch with everything needed merged, continuously
> * feature branches that contain one and only one new feature

So, we could make something like

master
active-development (testing everything)
active-development/feature

And when a feature is mature enough (aka merged into active-development a 
while ago and tested) it can be merged into master?

Sounds ok

-- 
Money can't buy happiness, but neither can poverty.
   -- Leo Rosten