[Pulp-list] 3.3.1 migration error

[Bin Li (BLOOMBERG/ 120 PARK)]

Hi All,
Getting an error to upgrade from 3.3.  run 'python manage.py makemigrations --merge' gave more errors. Anyidea how this can be fixed?

TASK [pulp-database : Run database auth migrations] **********************************************************************************************************
fatal: [pulp3-2]: FAILED! => {"changed": true, "cmd": ["/opt/utils/venv/pulp/3.7.3/bin/django-admin", "migrate", "auth", "--no-input"], "delta": "0:00:03.534845", "end": "2020-05-08 15:44:20.362670", "msg": "non-zero return code", "rc": 1, "start": "2020-05-08 15:44:16.827825", "stderr": "CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0009_revision_null, 0009_auto_20200425_1932 in rpm).\nTo fix them run 'python manage.py makemigrations --merge'", "stderr_lines": ["CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0009_revision_null, 0009_auto_20200425_1932 in rpm).", "To fix them run 'python manage.py makemigrations --merge'"], "stdout": "", "stdout_lines": []}


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/pulp-list/attachments/20200508/362a1e13/attachment.htm>