Resolving circular dependencies when squashing migrations

I'm attempting to squash migrations on my Django 1.8 project and am running into a mess of circular dependencies. The docs suggest in this case to "break out one of the ForeignKeys in the circular dependency loop into a separate migration, and move the dependency on the other app with it." [1] 

I was able to successfully do this, but that presents another problem: now I have an additional migration which Django attempts to run but fails because it's trying to run commands that have already been run and runs into duplicate column errors.

I realize I could --fake the necessary migrations, but that means manual intervention in every environment this is deployed to. Is there some other way I can do this? Or is the only solution to add the extra migration then --fake it everywhere?

_Nik

[1] https://docs.djangoproject.com/en/1.8/topics/migrations/#squashing-migrations

--
You received this message because you are subscribed to the Google Groups "Django users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to django-users+unsubscribe@googlegroups.com.
To post to this group, send email to django-users@googlegroups.com.
Visit this group at http://groups.google.com/group/django-users.
To view this discussion on the web visit https://groups.google.com/d/msgid/django-users/d2b5edf1-1037-4e44-9bb6-c225858414e2%40getmailbird.com.
For more options, visit https://groups.google.com/d/optout.