Much more information about this project is at https://github.com/weitzman/multiplesite.
This repo has the base configuration in the master branch. In addition, there is 1 branch for each client site, also storing configuration. This arrangement makes it easy to merge configuration changes from master to clients which still allowing clients to vary slightly when necessary. Furthermore, it is very easy to compare client configuration against master or against another client.
- The master config is force pushed from multiplesite to this repo via
git-subsplit.sh publish config/master:git@github.com:weitzman/multiplesite-config.git --heads=master. This depends on the git-subsplit helper tool. This can be automated for every push via a web hook. Webtask.io looks great for hosting web hook code. - The composer.json files in each branch specify a package type of 'bonefish-package.' We need to specify a type in order for composer-installers to work, and bonefish is the silliest option.
- It is possible to have git conflicts when merging from master to client branches. There may be a way with rerere to save the conflict resolution for use on other client branches.