Hi all,
I don't entirely understand why if you merge a branch to the trunk twice and
don't use 2 -j args for the second merge, the changes brought in with the
1st merge will sometimes show up as conflicts. I'd expect that CVS would
recognize that for each such change that is already in the trunk, a warning
or something would be printed rather that it showing up sometimes as a
conflict
This actually is a simple case of what I'm experiencing because we have a
rather complicated collection of branches which can (unless we are very
careful) lead to the same set of changes being in both the source and target
of a merge. In this situation we face many "false" conflicts that although
are easy to resolve, we'd like to avoid them entirely.
Any insight for me out the?
Thanks,
ksb
