> > Would there be a way to set my subversion up such that I can use it to > merge the latest Cake version with my local website repository? Such > that the latest version I retrieved from Cake's SVN could be merged > with my local site in case I made changes to my local copy of cake's > core files? > > Or rather, what's the best way to keep it all up-to-date without losing > my modifications?
if you are editing the files in your working copy and are doing an svn update then you'll keep your changes. If there have been changes to the files you have changed then 2 things can happen depending on if the changes conflict. 1. no conflict, svn merges the remote changes into your local copy 2. there are conflicts, svn tells you and you can resolve the conflicts by hand. its the beauty of using revision control. :) martin --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Cake PHP" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/cake-php -~----------~----~----~----~------~----~------~--~---
