Community Tip - Did you get an answer that solved your problem? Please mark it as an Accepted Solution so others with the same problem can find the answer easily. X
I'm trying to resync change packages for merging using the si.exe resynccp command. Is there an option to this command to skip certain files in the change package when merging ?
Unfortunately, there is no way to specify files to use or skip in merge. The merge options in the resynccp command are limited to the following:
--[no|confirm]merge Confirm whether or not to perform merges
--[no|confirm]mergeOnBranch If target revision is on a branch, perform a merge.
--mergeType=[confirm|cancel|automatic|manual] Try to automatically perform the merge or launch the conflict resolution tool
--notify=[never|onCompletion|onError] Display report when the operation is complete
--onMergeConflict=[confirm|cancel|mark|launchtool|highlight|error] What to do when conflicts occurred during the merge