"svn merge http://code.djangoproject.com/svn/django/trunk"; gives me the "svn help merge" message.
here's what i did: $ svn co http://code.djangoproject.com/svn/django/branches/schema-evolution/ django_tmp_src [normal checkout crap] $ cd django_tmp_src/ $ svn merge http://code.djangoproject.com/svn/django/trunk [help message] god i miss cvs... Kenneth Gonsalves wrote: > > On 26-Oct-06, at 12:40 PM, Derek Anderson wrote: > >> can someone who knows svn better than i help me out as to how i would >> refresh the branch with the latest from the trunk, and then remerge >> these changes back into it? > > in your working copy root do: > > svn merge http://code.djangoproject.com/svn/django/trunk > > and then, after resolving conflicts do > > svn commit > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django developers" group. To post to this group, send email to django-developers@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/django-developers -~----------~----~----~----~------~----~------~--~---
