Github Что за ошибка при обновлении кода на pythonanywhere.com? Не могу исправить
Формулировка задачи:
(myvenv) 04:12 ~/my-first-blog (master)$ git pull
Updating 83263a2..35c802a
error: Your local changes to the following files would be overwritten by merge:
mysite/settings.py
Please, commit your changes or stash them before you can merge.
Aborting
(myvenv) 04:13 ~/my-first-blog (master)$
может у меня в этом коде неправильные настройки?
WSGI configuration file:
Листинг программы
- import os
- import sys
- from django.core.wsgi import get_wsgi_application
- from whitenoise.django import DjangoWhiteNoise
- path = '/home/mig131/my-first-blog' # use your own username here
- if path not in sys.path:
- sys.path.append(path)
- os.environ['DJANGO_SETTINGS_MODULE'] = 'mysite.settings'
- application = DjangoWhiteNoise(get_wsgi_application())
код в pycharm settings.py
может тут в wsgi изменить надо?
Листинг программы
- """
- Django settings for mysite project.
- Generated by 'django-admin startproject' using Django 1.10.2.
- For more information on this file, see
- [url]https://docs.djangoproject.com/en/1.10/topics/settings/[/url]
- For the full list of settings and their values, see
- [url]https://docs.djangoproject.com/en/1.10/ref/settings/[/url]
- """
- import os
- # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
- BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
- # Quick-start development settings - unsuitable for production
- # See [url]https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/[/url]
- # SECURITY WARNING: keep the secret key used in production secret!
- SECRET_KEY = '*******************************************'
- # SECURITY WARNING: don't run with debug turned on in production!
- DEBUG = True
- ALLOWED_HOSTS = ['mig131.pythonanywhere.com', '127.0.0.1']
- # Application definition
- INSTALLED_APPS = [
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
- 'blog.apps.BlogConfig',
- 'django.contrib.admin',
- ]
- MIDDLEWARE = [
- 'django.middleware.security.SecurityMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.common.CommonMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
- 'django.middleware.clickjacking.XFrameOptionsMiddleware',
- ]
- ROOT_URLCONF = 'mysite.urls'
- TEMPLATES = [
- {
- 'DIRS': [os.path.join(BASE_DIR, 'blog/templates')],
- 'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'APP_DIRS': True,
- 'OPTIONS': {
- 'context_processors': [
- 'django.template.context_processors.debug',
- 'django.template.context_processors.request',
- 'django.contrib.auth.context_processors.auth',
- 'django.contrib.messages.context_processors.messages',
- ],
- },
- },
- ]
- WSGI_APPLICATION = 'mysite.wsgi.application'
- # Database
- # [url]https://docs.djangoproject.com/en/1.10/ref/settings/#databases[/url]
- DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
- }
- }
- # Password validation
- # [url]https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators[/url]
- AUTH_PASSWORD_VALIDATORS = [
- {
- 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
- },
- {
- 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
- },
- {
- 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
- },
- {
- 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
- },
- ]
- # Internationalization
- # [url]https://docs.djangoproject.com/en/1.10/topics/i18n/[/url]
- LANGUAGE_CODE = 'ru-ru'
- TIME_ZONE = 'Europe/Moscow'
- USE_I18N = True
- USE_L10N = True
- USE_TZ = True
- # Static files (CSS, JavaScript, Images)
- # [url]https://docs.djangoproject.com/en/1.10/howto/static-files/[/url]
- STATIC_URL = '/static/'
- STATIC_ROOT = os.path.join(BASE_DIR, 'static')
Решение задачи: «Github Что за ошибка при обновлении кода на pythonanywhere.com? Не могу исправить»
textual
Листинг программы
- git status
ИИ поможет Вам:
- решить любую задачу по программированию
- объяснить код
- расставить комментарии в коде
- и т.д