Skip to content

RECIRCLE / portal

Go to a project

Resolve marge conflict

2 jobs from DEV in 1 minute 22 seconds (queued for 1 second)
e8679f39 e8679f39c7d57255e679b11bdd0cc7fd47a1510a
Status Job ID Name Coverage
  Test
passed #1126
flake8

00:20

failed #1127
test

01:01

 
Test test 
To activate this project's virtualenv, run pipenv shell.
Alternatively, run a command inside the virtualenv with pipenv run.
$ cd recircle
$ pipenv run python manage.py test
nosetests image instance storage template --verbosity=1
Creating test database for alias 'default'...
CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0010_merge_20190731_1215, 0010_merge_20190723_0841 in instance).
To fix them run 'python manage.py makemigrations --merge'
ERROR: Job failed: exit code 1