The following document describes the steps used that cover a standard parallel development scenario across two streams.
The attached document describes a practical 6 step scenario working on both the mainline and patch development and how Araxis Merge can be used to help assist the merge conflicts.
Step 1: Main Line Development (Version 1.0)
Step 2: Work on a Branch Patch Release (Version 1.1)
Step 3: Make a patch modification (Version 1.1)
Step 4: Main Line Development (Version 2.0)
Step 5: Merge the branch modifications into the mainline
Step 6: Review the merge
Please see the attached document for further details.