<html><head><title></title></head><body><div class="rte-style-maintainer rte-pre-wrap" data-color="global-default" bbg-color="default" data-bb-font-size="medium"bbg-font-size="medium" style="white-space: pre-wrap; font-size: small; font-family: "Courier New", Courier, "BB.FixedWidth";"style="white-space: pre-wrap; font-size: small; font-family: "Courier New", Courier, "BB.FixedWidth"; color: rgb(0, 0, 0);"><div>Hi All,</div><div>Getting an error to upgrade from 3.3. run 'python manage.py makemigrations --merge' gave more errors. Anyidea how this can be fixed?</div><div><br></div>TASK [pulp-database : Run database auth migrations] **********************************************************************************************************<div>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": []}</div><div><br></div><div><br></div></div></body></html>