learning-unlimited/ESP-Website — Issue #102: Merge template changes with overrides
Author: aseering
Created: 2011-11-23 05:42:16+00:00
State: open
Labels: ArchitecturalChange, Infrastructure

When someone runs "git pull" and pulls in a bunch of new templates, we should do something reasonable in the case that some of the modified templates are also templates that they have overridden. The current proposal is to auto-merge, and to prompt the user to merge by hand if this isn't possible.