Re: Merging (only) subdirectories

[Enrico Weigelt <weigelt@metux.de>]

* Nguyen Thai Ngoc Duy <pclouds@gmail.com> wrote:

> Also, please consider submodules if theme dir is totally independent.
> I don't see how it makes it problematic for testing. git-subtree [1]
> might be of your interest too.
> 
> [1] https://github.com/apenwarr/git-subtree

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).


cu
-- 
----------------------------------------------------------------------
 Enrico Weigelt, metux IT service -- http://www.metux.de/

 phone:  +49 36207 519931  email: weigelt@metux.de
 mobile: +49 151 27565287  icq:   210169427         skype: nekrad666
----------------------------------------------------------------------
 Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme
----------------------------------------------------------------------