Viewing Conflicts during Merge
To view conflicts encountered during the merge:
1. Open the stream in which the changes are applied.
2. On the Streams action menu, select View Items with Merge Conflicts.
The Stream Name » Merge Conflicts page opens. A table displays items that have merge conflicts in the selected stream. The following columns are displayed.
◦ ID
◦ Item Name
◦ Tracker
◦ Project
◦ Source Stream
◦ Source Stream Baseline
3. Select an item.
A new tab, Merge Conflicts on Item, for the conflict item opens.