si mergebranch
merges changes made on a branch into a single revision
Synopsis
si mergebranch [--mergeType=[confirm|cancel|automatic|manual]] [--onMergeConflict=[confirm|cancel|mark|launchtool|highlight|error]] [--[no]failOnAmbiguousProject] [--branchRevision=value] [(--cpid=ID|--changePackageId=ID)] [--issueId=ID] [(--[no]lock)] [--targetRevision=value] [(-R|--[no|confirm]recurse)] [--filter=filteroptions] [(-S sandbox|--sandbox=sandbox)] [--hostname=server] [--port=number] [--password=password] [--user=name] [(-?|--usage)] [(-F file|--selectionFile=file)] [(-N|--no)] [(-Y|--yes)] [--[no]batch] [--cwd=directory] [--forceConfirm=[yes|no]] [(-g|--gui)] [--quiet] [--settingsUI=[gui|default]] [--status=[none|gui|default]] sandbox member...
Description
si mergebranch allows you to combine the development occurring on different branches by merging the branched revisions into a single revision.
Windchill RV&S recognizes cases where a previous merge has occurred, (whether by merging the branch, automatic merging, or using the Visual Merge or a third party merge tool), and merges only changes since the last merge operation. Thus, the first merge branch operation occurring on a given branch merges all changes throughout the branch. Any subsequent merge branch operations will merge only changes since the previous merge operation.
Options
This command takes the universal options available to all
si commands, as well as some general options. See the
options reference page for descriptions.
• --mergeType=[confirm|cancel|automatic|manual]
specifies how you want to complete the merge.
--mergeType=confirm prompts you to confirm a merge type.
--mergeType=cancel cancels the selected merge.
--mergeType=automatic completes the merge process without launching the Visual Merge tool.
|
|
While Windchill RV&S and Visual Merge are capable of performing automatic merging, PTC cannot guarantee that the merged results are “correct”. PTC recommends that you examine and test the merged results before checking them into the repository.
|
--mergeType=manual completes the merge operation through the Visual Merge tool or a third party merge tool, depending on your Difference and Merge Tool preferences. The merge tool launches, displaying the revisions you want to merge. For more information on the Visual Merge tool, refer to the Centre d'aide Windchill RV&S.
• --onMergeConflict=[confirm|cancel|mark|launchtool|highlight|error]
specifies what to do when conflicts occur during the merge.
--onMergeConflict=confirm prompts you to confirm a merge conflict option.
--onMergeConflict=cancel cancels the merge.
--onMergeConflict=mark marks the working file indicating that merging is required without completing all of the merge related tasks. This provides the time you may need to investigate conflicts, edit, or difference blocks before finishing the merge.
--onMergeConflict=launchtool launches the Visual Merge tool to resolve the conflicts, all non-conflicting blocks will already have been applied.
--onMergeConflict=highlight indicates conflicts in the file with the following characters: "<<<<<<" and ">>>>>>". You are responsible for manually resolving conflicts in the working file.
|
|
--onMergeConflict=launchtool does not require the -g or --gui options.
|
--onMergeConflict=error displays an error when a merge conflict is encountered.
• --branchRevision=revision
specifies the branch revision that you want to merge into the head revision. If no revision is specified, the working revision is used.
• --[no]lock
controls whether to lock the target revision, so that the results of the merge can be checked in. The lock type used is based on your locks policy. For information on your locks policy, contact your administrator.
• --targetRevision=revision|:symbolic
specifies the symbolic name (i.e. member, working, branch, etc.), revision number, or label of the revision that you want to merge the branch revision into; typically the head revision. If no revision is specified, the member revision is used.
• sandbox member...
identifies a specific member; use spaces to specify more than one member.
Diagnostics
See the
diagnostics reference page for possible exit status values.
Preferences
Using
si setprefs or
si viewprefs, you are able to set or view the preference keys for this command.
See Also
• Commands:
• Miscellaneous:
