Change Set Management - Non-Trivial Merge
While cset1 was in progress,cset2
was opened and a change made
against the same element. Cset1 was
merged first, cset2’s merge is therefore
To correct, diff cset2 against the
98A trunk to create a merge script
that will merge out /main/2