Question

我试图推送提交，但我们的CircleCI产生以下令人费解的错误消息：

#!/bin/bash -eo pipefail
cd lucy-web
source venv/bin/activate
python manage.py compilescss --verbosity 0
python manage.py collectstatic --clear --no-input --verbosity 0
python manage.py test
Traceback (most recent call last):
  File "manage.py", line 29, in <module>
    execute_from_command_line(sys.argv)
  File "/root/lucy/lucy_web/lucy-web/venv/lib/python3.6/site-packages/django/core/management/__init__.py", line 364, in execute_from_command_line
    utility.execute()
  File "/root/lucy/lucy_web/lucy-web/venv/lib/python3.6/site-packages/django/core/management/__init__.py", line 356, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/root/lucy/lucy_web/lucy-web/venv/lib/python3.6/site-packages/django/core/management/base.py", line 283, in run_from_argv
    self.execute(*args, **cmd_options)
  File "/root/lucy/lucy_web/lucy-web/venv/lib/python3.6/site-packages/django/core/management/base.py", line 330, in execute
    output = self.handle(*args, **options)
  File "/root/lucy/lucy_web/lucy-web/venv/lib/python3.6/site-packages/sass_processor/management/commands/compilescss.py", line 153, in handle
    self.parse_source(py_source)
  File "/root/lucy/lucy_web/lucy-web/venv/lib/python3.6/site-packages/sass_processor/management/commands/compilescss.py", line 199, in parse_source
    tree = ast.parse(open(filename, 'rb').read())
  File "/usr/local/lib/python3.6/ast.py", line 35, in parse
    return compile(source, filename, mode, PyCF_ONLY_AST)
  File "<unknown>", line 26
    <<<<<<< HEAD
     ^
SyntaxError: invalid syntax
Exited with code 1

似乎Python的ast.py中存在git合并冲突。这怎么可能发生，我该如何解决？

由于/usr/local/lib/python3.6中明显的合并冲突，CircleCI测试失败

0 个答案: