On Fri, Nov 15, 2013 at 01:33:40PM -0800, Andrew wrote:
> Hello,
> I'm in the process of moving to Git. Mostly I am very happy but I
> figure out, or find a reference anywhere, of how you deal with
> multiple dependencies in Git. 
> My problem: suppose that I have two independent branches A and B,
> which may not even touch the same files. Now I start a new
> development branch C which wants to use features from different
> commits in A and B. I'd like C to to branch off BOTH A and B. I'm
> not sure that I can draw these fancy branch diagrams to the
> standards of this group, but the situation looks something like
> this:
> *--*--*--*--...--* master
>       |   \-*--*--*--* A
>       |         |-*--*--*--* C
>       |-*--*--*--*--*--* B
> Is it possible to do something like this in Git? Am I missing
> something obvious?

Your illustration got a bit mangled on the way to me, but wouldn't it
basically just be to

 1. branch off A at the point you want
 2. merge in from B up till the point you want

Otherwise, there's always cherry-pick.

How would you accomplish what you ask for in the VCS you currently


Magnus Therning                      OpenPGP: 0xAB4DFBA4 
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe               http://therning.org/magnus

Those who would give up Essential Liberty to purchase a little
Temporary Safety, deserve neither Liberty nor Safety
     -- Benjamin Franklin, Historical Review of Pennsylvania, 1759

Attachment: pgpnV16YF6WCQ.pgp
Description: PGP signature

Reply via email to