merge

Merge files to compare, accept, or reject differences and combine changes into a new file.

sscm merge File [-bTargetBranch] [-h] [-pTargetRepository] [-uMergeUtility] [-vVersion] [-i|-i-] [-y[Username:Password|+|=]] [-zSCMServerAddr:PortNum|zPath] [+u] [-rSourceRepository] [-sSourceBranch] [-fSourceFile]

Option	Description
File	File in working directory to merge into.
-b	Branch that contains file to merge with. If not specified, default working directory branch is used.
-f	Source file to merge from. If not specified, filename in the File argument is used.
-h	Display online help for the command.
-i	Use Guiffy diff/merge utility. Enter -i- to use utility specified in -u.
-p	Full path to repository, including parent repositories. If not specified, default working directory repository is used.
-r	Full path to source repository, including parent repositories. If not specified, default working directory repository is used.
-s	Branch that contains source file to merge from. If not specified, default working directory branch is used.
-u	Full path to merge utility. Enter %1 for common version file, %2 for newer version file, %3 for modified working directory file, and any other utility options. If merge utility is not specified, default merge utility is used. Use setclient to change the default merge utility.
-v	File version to merge from.
-y	Enter a Surround SCM username and password if you do not want to use the default value. To use single sign-on, enter -y+. If you use an identity provider to authenticate, the provider web page opens if you have not yet authenticated. Authenticate with the provider and then return to the CLI.
-z	Enter the Surround SCM Server host computer address and port number if you do not want to use the default value. IPv6 addresses must be in square brackets. If you received a server settings file from your Surround SCM administrator, enter the path to the XML file instead of entering the server connection information.
+u	Display output in Unicode (Windows only). Output cannot be sent to a file. If output is enabled for all commands, enter +u- to disable it for this command.