Resolving baseline conflicts

If your project uses composite baselines, you may encounter a situation where you must resolve a conflict in a stream configuration between two different baselines of the same component. The following conflicts can occur during operations that involve baselines:
  • Making a baseline
  • Adding a baseline to a stream configuration
  • Recommending a baseline
  • Rebasing a stream