From: Howard Miller <howard@e-learndesign.co.uk>
To: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Merging (only) subdirectories
Date: Wed, 1 Dec 2010 12:55:55 +0000 [thread overview]
Message-ID: <AANLkTi=gDdasJ1gsAgSCxQ5a3pWvTNCfiaSn5h-WUt1C@mail.gmail.com> (raw)
In-Reply-To: <AANLkTik-d8oys9h=wFRnyt8sukTsSymaw5LGM39BU2K=@mail.gmail.com>
On 1 December 2010 12:36, Nguyen Thai Ngoc Duy <pclouds@gmail.com> wrote:
> 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
>
Thanks! Again, I need to go and do some reading to see if those things
fit my needs.
next prev parent reply other threads:[~2010-12-01 12:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-01 11:18 Merging (only) subdirectories Howard Miller
2010-12-01 11:47 ` "Martin Krüger"
2010-12-01 11:56 ` Howard Miller
2010-12-01 11:59 ` Howard Miller
2010-12-01 12:36 ` Nguyen Thai Ngoc Duy
2010-12-01 12:55 ` Howard Miller [this message]
2010-12-03 10:59 ` Enrico Weigelt
2010-12-03 11:12 ` Howard Miller
2010-12-03 20:38 ` Enrico Weigelt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTi=gDdasJ1gsAgSCxQ5a3pWvTNCfiaSn5h-WUt1C@mail.gmail.com' \
--to=howard@e-learndesign.co.uk \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).