When you modify your settings.py file of your Django project on production servers you can get errors like this when updating the code: $ git fetch $ git merge origin/master ... error: Your local changes to 'settings.py' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge. ... [...]