I have a short question about how to use Django-South while working in a team.
What happens if two people simultaneously create migration file on changes to the same file?
For example, A and B are working on same Django app. They are working in different branch and both at migration 005. Now, both A and B modifies apple/models.py and created migration file using startmigration. They are both at migration 006 but with completely different migration file 006. I guess when they merge their branches, there might be some error with South.
Is there any workaround to resolve this conflict? Or is South smart enough to resolve it by itself?