On 10 nov, 15:52, WebbedIT <[email protected]> wrote: > Firstly, forgive me for my limited knowledge of GIT and SVN. > > I am trying to create an online manual (cookbook) for a CakePHP > application I am developing. After checking out the source code and > configuring my dbase I realised that I could also do with the bakery > source code too.
The bakery and cakebook are not functionally equivalent. > > So I have checked out the bakery code but now have a GIT repository > (CakeBook) and an SVN repository (Bakery). How do I go about merging > these two repositories and adding them to 1.2.5 without overwriting > any code? When you say "merge" what do you mean? Use both? Regards, AD -- You received this message because you are subscribed to the Google Groups "CakePHP" 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?hl=.
