02.05.2013 Views

Description - Mks.com

Description - Mks.com

Description - Mks.com

SHOW MORE
SHOW LESS

You also want an ePaper? Increase the reach of your titles

YUMPU automatically turns print PDFs into web optimized ePapers that Google loves.

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 conflicts in the working file.<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]confirm<br />

Confirm the actions before starting them.<br />

--[no|un]expand<br />

specifies whether Source Integrity should expand, unexpand, or ignore keywords when<br />

checking out working files.<br />

-f<br />

--[no|confirm]overwriteChanged<br />

forces overwrite of changed working files.<br />

--[no|confirm]createVariants<br />

controls whether to confirm the creation of variant projects as needed.<br />

--[no]ignoreBranches<br />

Causes Source Integrity to use the most recent revision when it encounters two revisions of<br />

the same member on two development paths in the change package being applied.<br />

--[no]ignoreServer<br />

Causes Source Integrity to perform the Apply CP operation even if the change package<br />

members reside on different servers.<br />

--[no|confirm]merge<br />

controls whether to confirm all merge operations before <strong>com</strong>pleting them.<br />

--[no|confirm]mergeOnBranch<br />

controls whether to cause Source Integrity to perform a merge if the target revision is on a<br />

branch. Source Integrity differences the two file revisions and merges any changes into the<br />

213 of 457

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

Saved successfully!

Ooh no, something went wrong!