Resolve Merge Conflicts

If there are conflicts between the contents of a topic stream and its parent, you must resolve them before you can merge the pull request.

Key Facts

Example

In example below there are conflicts between the content of topic stream Feature_1 and Mainline:

parent_topic_stream_merge_conflicts.png