On 6/10/06, Jeff Jensen <[EMAIL PROTECTED]> wrote:
> -----Original Message-----
> From: Kenney Westerhof [mailto:[EMAIL PROTECTED]
> Sent: Saturday, June 10, 2006 1:27 PM
> To: Maven Developers List
> Subject: Re: Commit MJAR-38
>
> On Sat, 10 Jun 2006, Mike Perham wrote:
>
> > Side note: I don't use Subversion daily - what's the command(s) to
> > merge a change from the 2.0.x branch to the 2.1 trunk?
>
> Usually you should commit on trunk first and then merge with
> the branch, but technically it doesn't matter.
It is safest and typical to merge from the codeline that has changed the
least.
Which means typically merge from the release maintenance codelines to the
trunk/main.
We follow http://docs.codehaus.org/display/MAVEN/Development+Process
Everything goes into trunk so we make sure nothing is forgotten for
next releases
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
--
I could give you my word as a Spaniard.
No good. I've known too many Spaniards.
-- The Princess Bride
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
