Maintaining One Code Base with Possibly Conflicting Custom Features | Dark Hacker News