Share, like, connect

[Sebastian Kügler]

On Thursday, June 09, 2011 13:10:32 Marco Martin wrote:
> On Thursday 09 June 2011, Aaron J. Seigo wrote:
> > On Wednesday, June 8, 2011 21:33:07 Marco Martin wrote:
> > > they have to be used since the development of contour depends 100% from
> > > them, the question is how? ;)
> >
> > 
> >
> > 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?

That sound fine and would certainly make it more manageable.

> shouldn't even matter if its history becomes an horrid octopus due to 
> continuous merges, since when everything needed will me in master that
> branch  could be just deleted.

-- 
sebas

http://www.kde.org | http://vizZzion.org | GPG Key ID: 9119 0EF9