I'm a recent convert to Git, and like what I've got so far. Having
said that, over the years I've come to apply a few hard-and-fast
source and configuration management rules/processes that I know work
(for me and in teams).
I can't find how to do what I need to do in Get (yet) and it is more
efficient to ask the collective mind, since I've checked the obvious
sources and FAQ-s, etc.
At this stage, I'd like to know how-to (or is it possible) to
structure branches such that non-conflicting work on branch-A is
inherited by a daughter-branch (say branch-A.01)?
---o---- master --- ...
*--- A ---o---o-------- XX -- ...
\ \ |
\ \ V
\ *--- 2 --XX--- ...
*---- 1 --XX--- ...
If I chagve XX in branch-A that change is 'automatically' in branch-A.
1 and branch-A.2.
The need is clear I hope -- I want say all bug fixes in branch-A to be
seen in A.2 as well. If anyont changes XX while working on the branch-
A.2 then there's a conflict and you'd need to resolve it.
Anyway what's the easiest (and minim of human action) that will work
like that with Git? I recall we had a lot of c-shell scripts to make
SCC-s do like this 'one time'. It is definitely worth doing.
Because git is a configuration manager, it may not understand 'fine
grain' stuff like inheriting files. Is there a way to link
configurations or amalgamate them?
Thanks in advance,
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to
For more options, visit this group at