-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
David Wood wrote:
|I _think_ my solution is to make a tag at the point A merged to B, and
|merge FROM that tag, TO "current B." This does appear to work.
|
|What confuses me about it even more is that, after I do this, I see
|changes on Home that I mad
>So I merge A into B, and then commit to B
>
>Then when I try to merge B into Home, I _still_ get conflicts - because
>A's delta is being merged twice? I think?
I never did merging branches, but from what I know I'd say you're right.
cvs doesn't know that some changes in B came from A and w
This is a complicated problem - a brainteaser if you will.
I have a "Home" branch, and two children which branch from home (A, and
B).
If I make a change in A, and then merge A into Home, great.
If I make a conflicting change in B and then try to merge B into Home, it
gives a conflict. Also
