[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Rephrasing: question about merging branches
From: |
David Wood |
Subject: |
Rephrasing: question about merging branches |
Date: |
Tue, 4 Nov 2003 11:06:44 -0500 |
Let me try to put it another way.
I have a parent branch, and it has two child branches. If I want one child
to merge to the parent, and then to the other child, how does that other
child later merge to the parent as well?
Is it (on the parent): update -j first_child_merge_point -j second child
If so, what happens to changes from before the first_child_merge_point?
-David
- Rephrasing: question about merging branches,
David Wood <=
- Re: Rephrasing: question about merging branches, Jamie Wellnitz, 2003/11/04
- Re: Rephrasing: question about merging branches, David Wood, 2003/11/04
- Re: Rephrasing: question about merging branches, Derek Robert Price, 2003/11/04
- Re: Rephrasing: question about merging branches, Jamie Wellnitz, 2003/11/04
- Re: Rephrasing: question about merging branches, Derek Robert Price, 2003/11/04
- Re: Rephrasing: question about merging branches, David Wood, 2003/11/04
- Message not available
- Re: Rephrasing: question about merging branches, Andy Jones, 2003/11/05
- Re: Rephrasing: question about merging branches, David Wood, 2003/11/05
- Re: Rephrasing: question about merging branches, Derek Robert Price, 2003/11/05
- Re: Rephrasing: question about merging branches, David Wood, 2003/11/05