git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Merging (only) subdirectories

From
Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date
Dec 1, 2010, 12:36 UTC
Message-ID
<AANLkTik-d8oys9h=wFRnyt8sukTsSymaw5LGM39BU2K=@mail.gmail.com>
In-Reply-To
<AANLkTimZc0r8WBOsE73V=7SKdZgONiCKfYCk7rBrCY3F@mail.gmail.com>

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
Previous: Howard MillerNext: Howard Miller
Message 5 of 9 in “Merging (only) subdirectories”
  1. Howard MillerDec 1, 2010
  2. Martin KrügerDec 1, 2010
  3. Howard MillerDec 1, 2010
  4. Howard MillerDec 1, 2010
  5. Nguyen Thai Ngoc DuyDec 1, 2010
  6. Howard MillerDec 1, 2010
  7. Enrico WeigeltDec 3, 2010
  8. Howard MillerDec 3, 2010
  9. Enrico WeigeltDec 3, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.