The scm resolve subcommand provides several options for resolving conflicts in a repository workspace.
scm resolve [ -r
| --repository-uri ] repository URI or nickname { [ -d | --dir ] workspace-path } [ [ -p | --proposed ] | [ -c | --checkedin ] ] path ...
scm resolve [ -r | --repository-uri ] repository URI [ -u | --username ] user ID in repository [ -P | --password ] password for user ID in repository { [ -d | --dir ] workspace-path } [ [ -p | --proposed ] | [ -c | --checkedin ] ] path ...
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 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.