resolve

Resolve conflicts in a workspace.

Purpose

The scm resolve subcommand provides several options for resolving conflicts in a repository workspace.

Synopsis

Options and arguments

-c  |  --checkedin ]
Resolve conflicts using the currently checked-in version.
-d  |  --dir ] workspace-path
The path name of a local workspace created by scm load or scm share. This subcommand runs with workspace-path set as the current working directory. You can omit this option if the current working directory is in a local workspace.
-P  |  --password ] password for user ID in repository
The password for the specified user ID in the named repository. If this option is not included on the command line, you are prompted for a password. If you specified a repository URI or nickname for which you have stored credentials using the scm login command, this option is ignored.
-p  |  --proposed ]
Resolve the conflict with the proposed changes, discarding yours.
-r  |  --repository-uri ] repository URI
Specifies the repository in which to take this action. If you have stored repository credentials using the scm login command, you can use the nickname you supplied for these stored credentials
-u  |  --username ] user ID in repository
Specifies a user ID that exists in the named repository. If you specified a repository URI or nickname for which you have stored credentials using the scm login command, this option is ignored.
path ...
Full path name, starting at the local workspace root, to one or more files or folders to resolve.

Examples

Working in a local workspace, you accept a change set that conflicts with a file in your workspace, as indicated by scm status:

C:\local-workspaces\HelloJazz>scm status -C
Workspace: (1101) "HelloJazz" <-> (1102) "HelloJazz Stream"
  Component: (1103) "HelloJazz"
    Baseline: (1108) 3 "beta2 updates"
    Conflicts:
      com.example.hellojazz.service/src/com/example/hellojazz/service/internal/>

    Outgoing:
      Change sets:
        (1115) !-@ <No comment>
          Changes:
            !--c /com.example.hellojazz.service/src/com/example/hellojazz/servi>

After using scm conflicts to view the extent of the conflicts (see the conflicts reference page for an example), you use scm resolve to resolve the conflict with the proposed changes.

C:\local-workspaces\HelloJazz>scm resolve --proposed com.example.hellojazz.service\src\com\example\hellojazz\service\internal\HelloJazzService.java

The merged change set, shown by scm status, is ready to be delivered.

C:\local-workspaces\HelloJazz>scm status -C
Workspace: (1101) "HelloJazz" <-> (1102) "HelloJazz Stream"
  Component: (1103) "HelloJazz"
    Baseline: (1108) 3 "beta2 updates"
    Conflicts:
      com.example.hellojazz.service/src/com/example/hellojazz/service/internal/>

    Outgoing:
      Change sets:
        (1115) --@ <No comment>
          Changes:
            !--c /com.example.hellojazz.service/src/com/example/hellojazz/servi>

C:\local-workspaces\HelloJazz>scm deliver 1115
Delivering changes from "HelloJazz" into "HelloJazz Stream"
  No baselines to flow.


Feedback

Did this help? You can provide feedback at Jazz.net (registration required): Comment in the forums or submit a bug