there was a problem. When I try to upload a site to "PythonAnywhere" after adding changes to the Django project, I get an error.

error: it can be overwritten by the merge: mysite / settings.py. Aborting.

How to fix it?

  • Do you have changes in the local mysite / settings.py file? - gil9red
  • @ gil9red I add only one line to mysite / settings.py: LOGIN_REDIRECT_URL = '/' - Bogdan Voytenko
  • Remove your changes to the file, repeat git pull and add again. Either commit changes and make a git pull merge (git will offer it) - gil9red
  • @ gil9red This is understandable, but I have to manually rewrite all the additions to the settings.py file on the website every time, and not touch the PC. This is not convenient and I can not check on the local host any additions. Or enter and then delete, and then enter them on Pythonanywhere.com - Bogdan Voytenko

0