7.6 Resolving Baseline Conflicts

If your project uses composite baselines, you may encounter a situation where you must resolve a conflict in a stream's configuration between two different baselines of the same component. Conflicts can occur during operations that involve baselines, such as the following:

• Making a baseline

• Adding a baseline to a stream's configuration

• Recommending a baseline

• Rebasing a stream

Conflicts Between a Composite Baseline and a Noncomposite Baseline

The simpler of the two conflict cases is when a composite baseline conflicts with a noncomposite baseline. For example, assume that a stream's configuration includes a composite baseline that selects baseline BL4 of component A, and that the composite baseline is the recommended baseline. After testing a new baseline, BL5, of component A, you decide to recommend it. By doing so, you override the member baseline, BL4, selected by the composite baseline. The Recommended Baselines dialog box identifies BL5 as an override and BL4 as overridden. UCM uses the same override and overridden identifiers in other GUIs.

Conflicts Between Two Composite Baselines

The more complex conflict case can occur when a stream's configuration includes multiple composite baselines where each composite baseline selects a baseline of the same component. A stream cannot select two different baselines of the same component. If you attempt to perform an operation that would cause this situation, UCM recognizes the conflict and forces you to resolve it before completing the operation.