Maintaining One Code Base with Possibly Conflicting Custom Features

database-programmer.blogspot.com