Re: Merging (only) subdirectories

> On Wed, Dec 1, 2010 at 6:18 PM, Howard Miller
> <howard@e-learndesign.co.uk> wrote:
>> What I would like to do is to be able to merge branch B into branch A
>> but ONLY stuff that concerns the theme directory. I don't think this
>> is possible. I'm reluctant to keep themes in a completely separate
>> repo as that just makes testing them more problematic.
>
> I don't know. Maybe you can use topic branch. The idea is that you and
> other theme designers branch out from a known point, then make changes
> in the theme directory only. You guys can merge from each other's tree
> because nobody would change anything outside theme directory.
> Occasionally you can merge back upstream for testing with new code,
> but don't push that merge until your theme is ready. Once your theme
> rolls out, you can either keep working on your topic branch, or throw
> it away and branch out again.
>
> 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
> --
> Duy
>