使用"python manage.py runserver"时出错

Question

我得到以下错误。我以前合并过一个分支机构，但没有成功。然后我使用git reset返回到以前的提交。之后，我尝试运行我的项目，但出现了以下错误。感谢您的帮助。

(oldenv(C:\New folder\Downloads\TECTUREPS2\bimscoper-rest-api>python manage.py runserver

Traceback (most recent call last):
File "manage.py", line 22, in <module>
execute_from_command_line(sys.argv)
File "C:New folderDownloadsTECHTUREPS2oldenvlibsite-packagesdjangocoremanagement__init__.py", line 364, in execute_from_command_line
utility.execute()
File "C:New folderDownloadsTECHTUREPS2oldenvlibsite-packagesdjangocoremanagement__init__.py", line 308, in execute
settings.INSTALLED_APPS
File "C:New folderDownloadsTECHTUREPS2oldenvlibsite-packagesdjangoconf__init__.py", line 56, in __getattr__
self._setup(name)
File "C:New folderDownloadsTECHTUREPS2oldenvlibsite-packagesdjangoconf__init__.py", line 41, in _setup
self._wrapped = Settings(settings_module)
File "C:New folderDownloadsTECHTUREPS2oldenvlibsite-packagesdjangoconf__init__.py", line 110, in __init__
mod = importlib.import_module(self.SETTINGS_MODULE)
File "C:New folderSoftwaresPython 2.7libimportlib__init__.py", line 37, in import_module
__import__(name)
File "C:New folderDownloadsTECHTUREPS2bimscoper-rest-apibimscopersettingsdevdev.py", line 9
<<<<<<< HEAD
^
SyntaxError: invalid syntax

Answer 1

我是由于manage.py文件中的更改而发生的。。只需创建一个空项目，并尝试将所有内容粘贴到一个新项目中，然后将它们全部迁移。它会起作用的。