Honestly, I don't rightly know. I suppose I could try a merge locally and see how painful it is. Otherwise I suppose the alternative is to make sure all trunk-to-branch catch-up merges are done atomically and extremely informatively, then replace?
-Matt --- On Fri, 3/13/09, James Carman <[email protected]> wrote: > From: James Carman <[email protected]> > Subject: Re: [collections] jdk5 branch > To: "Commons Developers List" <[email protected]> > Date: Friday, March 13, 2009, 3:45 PM > Are you going to merge or just > replace? > > On Fri, Mar 13, 2009 at 4:41 PM, Matt Benson <[email protected]> > wrote: > > > > I think this guy is getting ready to be merged back to > trunk after I make sure any trunk changes are merged over. > It'd be great if anybody wanted to have a look at it in > case I'm on crack. > > > > -Matt > > > > > > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: [email protected] > > For additional commands, e-mail: [email protected] > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
