scm resolve 次指令提供一些用來解決儲存庫工作區中之衝突的選項。
scm resolve [ -r | --repository-uri ] 儲存庫 URI 或暱稱 { [ -d | --dir ] workspace-path } [ [ -p | --proposed ] | [ -c | --checkedin ] ] path ...
scm resolve [ -r | --repository-uri ] 儲存庫 URI [ -u | --username ] 儲存庫中的使用者 ID [ -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
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>
C:\local-workspaces\HelloJazz>scm deliver 1115
Delivering changes from "HelloJazz" into "HelloJazz Stream"
No baselines to flow.