Missing merge migration

aschn / drf-tracking

Utils to track requests to Django Rest Framework API views

http://drf-tracking.readthedocs.org/

ISC License

366 stars 95 forks source link

Missing merge migration #109

Closed vycius closed 6 years ago

vycius commented 6 years ago

Currently by trying to apply migrations we will see error message:

CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0006_auto_20180315_1442, 0006_view_and_view_method_nullable in rest_framework_tracking).
To fix them run 'python manage.py makemigrations --merge'

This will fix the error as with this PR we have just one leaf node in migrations graph.

avelis commented 6 years ago

@vycius Thanks for addressing this merge conflict.

avelis commented 6 years ago

This PR fixes issue #112