Django migrate in pontoon

I changed my, so need migrated.

heroku is make .heroku/python/lib/python3.7/site-packages/django/contrib/auth/migrations/ and it’s deleted(yeah heroku’s filesystem…). so heroku run -a myapp ./ migrate is failed (but in local it’s success) so i upload to full migrated db, heroku’s django is not recognized.

so i put the pontoon/base/migrate. it’s error

  • CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0004_make_old_projects_public_again, 0005_auto_20200525_1848[local’s patchfile] in base).
    To fix them run 'python makemigrations --merge

and heroku run -a myapp ./ makemigrations --merge is put the error,

raise ValueError(“Could not find common ancestor of %s” % migration_names)
ValueError: Could not find common ancestor of {‘0005_auto_20200525_1848’, ‘0004_make_old_projects_public_again’}

so is fixing to this error things? in dyno, db error(5432 is not open) occur.

well, sorry for this. migration is ok. so very simple, my spend hours is very wastefully.

upload to git, ./Users/myuser/mozilla-pontoon/.heroku/python/lib/python3.7/site-packages/django/contrib/auth/migrations(so heroku’s’s maked) and deploy, heroku’s django is auto migrated.