User Guide - MKS

utility.c
Master Project
1.4
utility.c
Sandbox to Master
1.4
1.2.1.2
The default Resync CP operation.
Using the Merge On Branch Option
Using the Resync CP Command
Variant Project
1.2.1.2
1.2 1.2.1.1
utility.c
In this situation, you must use the Merge On Branch option
(--mergeOnBranch). This option essentially allows the changes on the
branch to be merged into the head revision file. Selecting Merge On Branch
allows Source Integrity to perform a differencing between revision 1.2 and
1.2.1.2 and then merge the result into revision 1.4. Once the Resync CP
operation completes, the file must then be checked in to finalize the
changes in the project.
383