Hello,
A couple of questions on how to manage a series of
hierarchically related branches.
I've created something like this:
----> master
\----> branchA
\----> branchB
\----> branchC
With the intent to be able to create three separate
patches that others can make to master and also continue
development on all three branches simultaneously.
What I'm doing at the moment is to "git-checkout"
one of the three branches A, B or C and make changes.
Note; I don't make changes to master as it represents the
upstream code and will be pulling from it periodically.
If the branch is a parent to a child and I want the
new changes in the parent to be seen by the children I
recursively check out the immediate child do a git-rebase.
For example:
*) git-checkout branchA
*) change some files on branchA
*) git-commit -a
*) git-checkout branchB
*) git-rebase branchA
*) git-checkout branchC
*) git-rebase branchB
This seems to work, but is somewhat arduous and I
was wondering if there is a better way?
Also, I'd like to checkout and work on all three branches
simultaneously. As is implied above, what I do at the moment is
use one repository and to switch branches I use git-checkout, so
as not to lose work when switching I need to commit before switching.
Sometimes I'd rather not commit as I may just want to look at what was
in another branch, possibly unrelated to this series. What is a good
way of handling this situation?
Regards,
Wink Saville
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html