Hi devs, in the past I had ugly problems with merging two svn directories: trunk and branches/mahono.
I tried it by hand and with kdiff3.. but unfortunately this is just a pain.. What is the best way to merge these dirs on a Debian/KDE machine? :-) Do I have to checkout the whole repository to let subversion do the merge? Or is there a simpler way? Any help is really appreciated as I would like to finally polish my suggestions for a change in the controller. Regards, Matthias --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "symfony developers" 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/symfony-devs?hl=en -~----------~----~----~----~------~----~------~--~---
