[GeoNode-devel] New error building Geonode Master

[Pieter du Plooy]

After having been away from updating Geonode Master for a couple of days, I
did a git pull and rebuild today, and got a strange error.

Any help on this?

Error is:

Step 6/9 : RUN python manage.py makemigrations --settings=geonode.settings
 ---> Running in d31ef72829aa
CommandError: Conflicting migrations detected; multiple leaf nodes in the
migration graph: (0003_auto_20200214_1013, 0003_auto_20200310_0848 in
mapstore2_adapter).
To fix them run 'python manage.py makemigrations --merge'
ERROR: Service 'django' failed to build: The command '/bin/sh -c python
manage.py makemigrations --settings=geonode.settings' returned a non-zero
code: 1

Pieter
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/geonode-devel/attachments/20200311/8e2505a5/attachment.html>