I was doing a vendor branching type merge (from cake 1.2 beta to cake 1.2 RC2, into my trunk).
After I did the merge, nothing worked. I found that SVN inserted commands (?) or tracking info (?) into into all my files. At the beginning of the file, it put in a line: <<<<<<< .working At the middle of the file it put in a line: ======= And at the end of the file, it put in the line: >>>>>>> .merge-right.r36 These subversion modifications are, of course, causing syntax errors in almost all my files. I can revert to get rid of them, but am wondering what am I doing wrong - I would like the merge to go through? What do they mean? --~--~---------~--~----~------------~-------~--~----~ 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=en -~----------~----~----~----~------~----~------~--~---
