> From: Andrew <andrew.mat...@gmail.com>
> 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.
You can do such a thing, if the base commit of C lists two commits,
one from A and one from B, as parents. This is what happens normally
when you execute a merge, one parent is the one that was checked out
in the working copy, and another parent is the commit that was merged
But it's not clear to me that it would be worth the bother in your
case. Having Git record that commit 2 is the descendent of commit 1
is only useful if a comparison of the two shows something useful, that
a diff (or "delta") taken between the two clearly expresses the
changes from the one to the other. If C is a mashup of features taken
from A and B, is there enough correspondence between C's files and A's
files to make a diff useful?
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.