Updated to Version 1.0.4 from 1.0.3 and now get Conflicting migrations

stormpath / stormpath-django

Django plugin for Stormpath

Apache License 2.0

38 stars 19 forks source link

Updated to Version 1.0.4 from 1.0.3 and now get Conflicting migrations #67

Closed mguidone closed 8 years ago

mguidone commented 8 years ago

CommandError: Conflicting migrations detected (0002_auto_20151016_1253, 0002_auto_20150826_1154 in django_stormpath). To fix them run 'python manage.py makemigrations --merge'

mguidone commented 8 years ago

Found left over migration in directory after an update, removed and recreated. All is well. Apologies for the false alarm.