Re: [MiNT] Merging branches

[Alan Hourihane <alanh@fairlite.co.uk>]

On Sun, 2010-06-13 at 18:58 +0200, Peter Slegg wrote:
> On Sun, 13 Jun 2010 16:45:00 , Alan Hourihane <alanh@fairlite.co.uk> wrote:
> >
> > On Sun, 2010-06-13 at 16:19 +0200, Peter Slegg wrote:
> > > How is progress on merging the branches going ?
> >
> > That was already done a week or so ago.
> >
> > Helmut's branch only slightly differs from the trunk now.
> >
> > Alan.
> >
> 
> So will the daily build disappear ?

No, because Helmut can still use his branch for staging of future major
changes that can be contained in his branch.

Same goes for me, I'll also create a branch if I feel the work I'm doing
is pretty structural.

But fixes, and minor updates should go straight to the trunk for
everyone.

Alan.