conflicts

Show unresolved conflicts.

Purpose

The scm conflicts subcommand displays unresolved conflicts in a workspace. You can show the proposed changes or your own changes.

Synopsis

Options and arguments

-m  |  --mine ]
Show the version of the conflicted resource in the repository 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 ]
Show the version of the conflicted resource proposed by the incoming change set.
-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
-q  |  --quiet ]
Suppress most informational messages while operating.
-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.
-v  |  --verbose ]
Provide additional informational messages while operating.

Examples

Working in a local workspace, you have 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>

Run scm conflicts to get more information about the conflicted resource:

C:\local-workspaces\HelloJazz>scm conflicts

Conflicts

  C-m- /com.example.hellojazz.service/src/com/example/hellojazz/service/internal/HelloJazzService.java

Problem running 'conflicts':

Unresolved conflicts remain.

Run scm diff to compare the version of the file in your workspace with the proposed change in the incoming change set (which, as shown by the previous scm status command, is in the stream with alias 1102):

C:\local-workspaces\HelloJazz>scm diff file com.example.hellojazz.service\src\com\example\hellojazz\service\internal\HelloJazzService.java stream 1102

--- com.example.hellojazz.service/src/com/example/hellojazz/service/internal/HelloJazzService.java      2008-06-03 09:17:36.000000723 -0400

+++ com.example.hellojazz.service/src/com/example/hellojazz/service/internal/HelloJazzService.java      2008-06-03 09:12:27.000000563 -0400

@@ -17,6 +17,6 @@

     implements IHelloJazzService {



     public String sayHello() throws TeamRepositoryException {

-        return "Hello Jazz! You're looking good!";

+        return "Hello Jazz! How are you?";

     }

}


Feedback