Source Control / Continuous Integration Advice
I'm trying to setup a source control / CI process that makes it easy for us to modify plugins/themes and also to upgrade vanilla. Up until now, we had a fork of vanilla where we had our own branch that contained plugins, themes (as submodules), and minor modifications to vanilla core (ie
bootstrap.after.php). Each time a new version was released, we'd follow these steps to rebase our branch against the new version's tag. But somehow this broke, and rebasing throws hundreds of conflicts. And frankly, it's beyond my git knowledge.
So I'm back to the drawing board, and I'm thinking perhaps we should just have a "plugins" repo, our theme as a repo, and perhaps an "applications" repo... or maybe one big repo with those 3 folders in it. And we'd install vanilla from source and then clone that repo on top of it. And then put in the
config.php file and apply the CHMOD commands... but I'm not sure we can have two repos sitting in the same directory. In a WordPress setup, we'd treat wordpress as a vendored dependency, in the vendor directory, and tell wordpress to use our "plugins" folder. But Vanilla comes with plugins, so we can't point it to another folder unless we pull in those plugins.
Does anyone have a good system for this? Ideally I'd like to automate this with CI but frankly even a good, easy process would be preferable to what we have now.
Thanks for your help