02.05.2013 Views

Description - Mks.com

Description - Mks.com

Description - Mks.com

SHOW MORE
SHOW LESS

Create successful ePaper yourself

Turn your PDF publications into a flip-book with our unique Google optimized e-Paper software.

epository.<br />

--mergeType=manual <strong>com</strong>pletes the merge operation through the MKS Visual Merge tool.<br />

The MKS Visual Merge tool launches, displaying the revisions you want to merge. For more<br />

information on the MKS Visual Merge tool, refer to the Source Integrity Enterprise User<br />

Guide.<br />

--onMergeConflict=[confirm|cancel|mark|launchtool|highlight|error]<br />

specifies what to do when conflicts occur during a merge.<br />

--onMergeConflict=confirm prompts you to confirm a merge conflict option.<br />

--onMergeConflict=cancel cancels the merge.<br />

--onMergeConflict=mark marks the working file indicating that merging is required<br />

without <strong>com</strong>pleting all of the merge related tasks. This provides the time you may need to<br />

investigate conflicts or edit difference blocks before finishing the merge.<br />

--onMergeConflict=launchtool launches the MKS Visual Merge tool to resolve the<br />

conflicts; all non-conflicting blocks will already have been applied.<br />

--onMergeConflict=highlight indicates conflicts in the file with the following characters:<br />

"". You are responsible for resolving merge conflicts before checking<br />

in the changes.<br />

Note: --onMergeConflict=launchtool does not require the -g or --gui options.<br />

--onMergeConflict=error indicates merge conflicts with an error message prompt.<br />

--[no]byCP<br />

controls whether to cause Source Integrity to operate in change package mode. Source<br />

Integrity automatically searches the change package associated with the member and<br />

resynchronizes all member files contained in that change package.<br />

Note:<br />

If there are no revisions in the change package to resynchronize, a normal resync is<br />

performed.<br />

--[no]confirm<br />

controls whether to proceed without confirmation messages when working with a change<br />

package (applies only when change packages are enabled).<br />

--[no]confirmPopulateSparse<br />

controls whether to proceed without confirmation messages when populating a sparse<br />

sandbox.<br />

--[no]includeDropped<br />

200 of 457

Hooray! Your file is uploaded and ready to be published.

Saved successfully!

Ooh no, something went wrong!