Should I be adding the Django migration files in the .gitignore file?
The solution usually used, is that, before anything is merged into master, the developer must pull any remote changes. If there's a conflict in migration versions, he should rename his local migration (the remote one has been run by other devs, and, potentially, in production), to N+1.
During development it might be okay to just not-commit migrations (don't add an ignore though, just don't add them). But once you've gone into production, you'll need them in order to keep the schema in sync with model changes.
You then need to edit the file, and change the dependencies to the latest remote version.
This works for Django migrations, as well as other similar apps (sqlalchemy+alembic, RoR, etc).
Should I be adding the Django migration files in the .gitignore file? 
I've recently been getting a lot of git issues due to migration conflicts and was wondering if I should be marking migration files as ignore. 
If so, how would I go about adding all of the migrations that I have in my apps, and adding them to the .gitignore file?