How to reset migrations in Django 1.7

I would just do the following on both the environments (as long as the code is the same)

1. Delete your migrations folder
2. DELETE FROM django_migrations WHERE app = <your app name> . You could alternatively just truncate this table.
3. python manage.py makemigrations
4. python manage.py migrate --fake

After this all your changes should get detected across environments.