User Guide - MKS

NOTE
Merging Branched Revisions
If your administrator has set the feature for enforced revision descriptions, you
must make an entry in the Revision Description field. If the field is blank,
Source Integrity displays an error message and the member is not checked in.
4 Under Options, click the desired tab, then modify the check in options.
For details on check in options, see “Checking In a Member” on
page 172.
5 To check in the member, click OK. To check in all remaining members,
click OK to All.
The Confirm Update Of Member Revision dialog box appears.
6 To check in and update a single selected member, click Yes. To check
in and update all selected members, click Yes to All.
The member is checked in. The new revision becomes the member
revision in the project, and the member revision number increments
accordingly.
To check in a single member without updating, click No. To check in
all remaining members without updating, click No to All.
NOTE
Source Integrity confirms the action to be taken if the working file you want to
check in has unresolved merge conflicts. For information on resolving merges,
see “Resolving Merges” on page 336.
The member is checked in but is not updated to the member revision.
The working revision number increments accordingly, and the
original member revision in the project remains unchanged.
To cancel the check in and update without checking in the member,
click Cancel.
Step Two: Merge Branch
In the second step, you can merge the changes between revisions on
branches, making the merged revision the member revision for the project.
For more details on merging, see “Merging Revisions” on page 322.
313