We are working with a PHP application which has no concept of switch-able themes; the situation is that we are modifying the application to add our own features, and CSS/Smarty templates for our own look and feel.
We have 2 projects base on this application, each with a different layout/presentation. Hence I need to have the repository to store both css/templates, but somehow am able to 'merge' in the right one for the respective project. How can this be done?