Matthew Flanagan wrote: > cd django_tmp_src > svn merge -r 3332:HEAD http://code.djangoproject.com/svn/django/trunk > > [resolve and conflicts and test your code] > svn co -m 'merged latest changes from trunk'
I think that should be: svn ci -m 'merged latest changes from trunk' After you resolve conflicts and things look good you check in your code. -Rob --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
