resolve conflict example
Resolve conflict example.
Examples
Working in a sandbox, you accept a change set that conflicts with a file in your workspace, as indicated by scm show status:
C:\local-workspaces\HelloJazz>lscm show 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>
You can use scm resolve conflict to resolve
the conflict with the proposed changes.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>lscm resolve conflict --proposed com.example.hellojazz.service\src\com\example\hellojazz\service\internal\HelloJazzService.java
The
merged change set, shown by scm show status,
is ready to be delivered.C:\local-workspaces\HelloJazz>lscm show status -C
Workspace: (1101) "HelloJazz" <-> (1102) "HelloJazz Stream"
Component: (1103) "HelloJazz"
Baseline: (1108) 3 "beta2 updates"
Outgoing:
Change sets:
(1115) ---@ <No comment>
Changes:
---c- /com.example.hellojazz.service/src/com/example/hellojazz/servi>
C:\local-workspaces\HelloJazz>lscm deliver 1115
Delivering changes from "HelloJazz" into "HelloJazz Stream"
No baselines to flow.
Workspace: (1101) "HelloJazz" <-> (1102) "HelloJazz Stream"
Component: (1103) "HelloJazz"
Baseline: (1108) 3 "beta2 updates"
Outgoing:
Change sets:
(1115) ---@ <No comment>
Changes:
---c- /com.example.hellojazz.service/src/com/example/hellojazz/servi>
C:\local-workspaces\HelloJazz>lscm deliver 1115
Delivering changes from "HelloJazz" into "HelloJazz Stream"
No baselines to flow.