geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Blevins <david.blev...@visi.com>
Subject Re: Web site update
Date Mon, 19 Jun 2006 23:02:27 GMT
On Jun 19, 2006, at 12:11 PM, Hernan Cunico wrote:

> Hi All,
> I'm a bit lost with the two branches we have now to manage the web  
> site.  I have the .../site/branches/may2006 branch updated and  
> ready to go live, it already includes that last two changes  
> (updated events and added book to documentation).
>
> What would be the next step? replacing the content of .../site/ 
> trunk and then commit to the live site from the updated trunk? how  
> do I replace it the content in .../site/trunk with the may2006 branch?

Typically, you'd merge over your changes.  Could use the 'svn merge'  
command.  Or you could create a patch file and apply it to trunk.  I  
like to use the graphical diff tool in Visual SlickEdit, but that's  
not free.

-David


Mime
View raw message