Re: Merge point confusion.

[Fabian Cenedese]

>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 weren't
written by hand. If I had to do this I'd update B from (Home+A). Like
that you have the A-changes in B too but now Home knows about it.
Just treat A and B as if they didn't know about each other. You want
to commit, you get conflicts, resolve conflicts, commit.

bye  Fabi