User Guide - MKS

Chapter 12: Advanced Change Package Operations
380
The developer decides to merge around all the intermediate change
packages and selects s (skip). The command continues as follows:
The following warnings have occurred:
-------------------
The following members require a merge to be performed:
tool.c
You have not specified a resolution change package, so
merged members will not be locked.
--------------------
*** The following set of operations will be performed:
Project: f:/Aurora_Project/project.pj
Sandbox: c:\Aurora_Sandbox\project.pj
Member tool.c: merge around differences: picking
up revisions 1.2 through 1.6, excluding
revisions 1.3, 1.4, 1.5, by checking out
Revision 1.2 into the working file, and merging
in the differences between Revision 1.6 and
Revision 1.2 with the differences between
Revision 1.5 and Revision 1.3.
Are you sure you wish to proceed? [yn](n): y
In this case, Resync CP updates the working file revision for main.c by
checking out revision 1.2 and then merging into the working file the
differences between 1.5 and 1.6. The intermediate revisions are not added
to the sandbox because the skip option was selected. Because the resync
operation does not involve a resolution change package, the merged
member is not locked.
u s e r g u i d e