caktus/django-project-template — pull request #101 by kmtracey (2014-06-19 16:56:52+00:00)
Title: Force overwrite of local changes in git.latest

I tested this on ccj first and it did over-write local changes to both files that needed to be overwritten and those that did not. Without this local mods on the servers survive deploys; if a deploy would over-write a file with a local mod the deploy fails until the local mod is removed. Since there should not be local mods done on the server it's better to my mind to always over-write them.