I have clearcase ucm with one int and two dev streams A and B. Two developers are working on two dev streams and modifying the same file.
A delivers to int and its code is built. The next time when I try to deliver B, it shows a conflict and while resolving the conflict, I can only select either the A change or B change.
I want to have both since A is already delivered and B I am delivering now. How should I resolve? Is this the expected behavior?
Is this the expected behavior?
It depends on which tool you are using to resolve the conflict. If it is a three-way merge tool, it should allows you to select both (source and destination of the merge), compared to a common ancestor.
This is what is described in "Using tools to compare and merge files and directories"
For merges that require you to resolve a conflict, the Rational ClearTeam Explorer includes tools that provide type-specific compare and merge capabilities
But nothing stops you to plug an external tool (BeyondCompare, kdiff3, WinMerge...)