geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Alan D. Cabrera" <>
Subject Re: Merging from 1.1 to HEAD
Date Tue, 11 Apr 2006 00:00:47 GMT
Aaron Mulder wrote, On 4/8/2006 5:06 PM:

>So I'm putting some stuff into 1.1, some of which is related to config
>IDs and some of which is not.
>My question is, for the stuff unrelated to config IDs, should I be
>merging to HEAD right away?  Or is it going to be easier if I don't
>and we merge "everything" at once later?

It has always been my experience that merging early as possible is 
always a good thing.  Do it while it's still fresh in your head and the 
target hasn't drifted to far.

>I have also previously put some things into HEAD which I would like to
>get into 1.1.  I assume I should merge those to 1.1 soon, because I
>expect we will prepare the 1.1 release before attempting to fully
>merge 1.1 into HEAD.  Is that right?

Well, if you want it to go into v1.1 I would merge it now.  If not, then 
why bother?


View raw message