Skip to content

RECIRCLE / portal

Go to a project

Resolve merge conflict in gitignore and Pipfile.lock

2 jobs from DEV in 1 minute 19 seconds (queued for 3 seconds)
2e681869 2e681869f23a085fc498939e0296063b26e1981a
Status Job ID Name Coverage
  Test
passed #1149
flake8

00:19

failed #1150
test

01:00

 
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: (0011_instance_template, 0011_merge_20190806_1052 in instance).
To fix them run 'python manage.py makemigrations --merge'
ERROR: Job failed: exit code 1