Share, like, connect

[Marco Martin]

On Thursday 09 June 2011, Ivan Cukic wrote:
> > > we need to be tracking no more than one branch in each of the
> > > repositories, and that is the branch that will be built from. if
> > > needed, a branch that marges in several of the other branches into
> > > it can be created.
> > 
> > so, we can say that for each repowe have a branch called active or
> > whatever, that merges together master and all needed branches, and that
> > one and only that one will be used for now for packaging?
> 
> I've been calling the branch contour-development (and merging with
> master), but if it's gonna be a general active thing, we can call them
> active-development (or a-d/master) and active-development/feature-name
> 
> The a-d/smth would be merged with the a-d(/master)

the reason i would like to have a separate development branch and the one who 
would be regularly packaged was to keep the actual development one with just 
the minimum merged to master required, so when it will be merged back the 
history will not be too much horrible

-- 
Marco Martin