顯示尚未解決的衝突。
scm conflicts 次指令會顯示工作區中尚未解決的衝突。 您可以顯示提議的變更,或顯示您自己的變更。
scm conflicts [ -r | --repository-uri ] 儲存庫 URI 或暱稱 { [ -d | --dir ] workspace-path [ [ -q | --quiet ] | [ -v | --verbose ] ] } [ [ -m | --mine ] | [ -p | --proposed ] ]
scm conflicts [ -r | --repository-uri ] 儲存庫 URI [ -u | --username ] 儲存庫中的使用者 ID [ -P | --password ] password for user ID in repository { [ -d | --dir ] workspace-path [ [ -q | --quiet ] | [ -v | --verbose ] ] } [ [ -m | --mine ] | [ -p | --proposed ] ]
C:\local-workspaces\HelloJazz>scm status -C
工作區:(1101) "HelloJazz" <-> (1102) "HelloJazz Stream"
元件:(1103) "HelloJazz"
基準線:(1108) 3 "beta2 updates"
衝突:
com.example.hellojazz.service/src/com/example/hellojazz/service/internal/>
送出:
變更集:
(1115) !-@ <No comment>
變更:
!--c /com.example.hellojazz.service/src/com/example/hellojazz/servi>
C:\local-workspaces\HelloJazz>scm conflicts
衝突
C-m- /com.example.hellojazz.service/src/com/example/hellojazz/service/internal/HelloJazzService.java
執行 'conflicts' 時發生問題:
保留尚未解決的衝突。
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?";
}
}