David Wheeler wrote:
On Mar 25, 2005, at 2:35 PM, Stas Bekman wrote:

Remember that the rename branch is not in sync with trunk. You will have to resync the two first. I think at least about 3 commits into the trunk weren't synced.
That shouldn't be necessary. You should be able to merge back into the trunk without having to merge the branch, first. Conflicts--if there are any--are usually pretty simple to resolve.

Cool. Less work for me.

--
__________________________________________________________________
Stas Bekman            JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/     mod_perl Guide ---> http://perl.apache.org
mailto:[EMAIL PROTECTED] http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org   http://ticketmaster.com

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Reply via email to