Re: Merging (only) subdirectories

Another option could be completely splitting off the themes to
their own branches (eg. using git-filter-branch), check them
out in an separate workdir and use unionfs to get a combined/merged
view of the working trees.

So, you'd actually have to fully separate branches, checked out
in their own worktrees/repos:

a) mainapp (the main application)
b) theme (the current theme you're working on)

For testing/runtime, the webserver gets a union'ed tree,
which just merges both namespaces (from host filesystems's, not
git's view) together. Your actual development happens in the theme
repo only.


On actual deployment (if you're using git here, too), you can simply
merge both branches together (will be just an passive - aka:
merge-down-only - branch).

Ok... thanks for that. I'll have a look at that as well.

This type of thing was actually the one thing I can think of that
cvs/svn made easy as they keep the repo info in each directory :)  (Do
I get thrown out for saying that?)