On 3/27/07, Ben Ford <[EMAIL PROTECTED]> wrote: > Hi there, > > I tried to merge the > multiple-db-support branch onto my working copy, merging r3198:HEAD as 3198 > was when the branch was created, but it failed and i ended up with a lot of > <<<<< .working and similar dotted around the files.
These are subversion markers indicating that the merge was not clean, and conflicts were detected - that is, modifications made in one stream conflict with modifications made in another. The branches are all independent, and depending on how active the branch is, a branch may not be up to date with the trunk, let alone other branches. If one branch were to cleanly merges into another, I would be extremely surprised - doubly so for the more complex branches like multi-db. That's not to say you can't get multi-db support into a checkout of the gis branch - just that you will need to manually resolve a lot of merges. Time for you to break out the Subversion manual :-) Yours, Russ Magee %-) --~--~---------~--~----~------------~-------~--~----~ 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?hl=en -~----------~----~----~----~------~----~------~--~---
