scm conflicts 子命令用于显示工作空间中未解决的冲突。您可以显示建议的变更或者您自己的变更。
scm conflicts [ -r | --repository-uri] 存储库 URI 或昵称 { [ -d | --dir] 工作空间路径 [ [ -q | --quiet] | [ -v | --verbose] ] } [ [ -m | --mine ] | [ -p | --proposed ] ]
scm conflicts [-r | --repository-uri] 存储库 URI [ -u | --username] 存储库中的用户标识 [ -P | --password] 存储库中用户标识的密码 { [ -d | --dir] 工作空间路径 [ [ -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)!-@ <无注释>
变更:
!--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?";
}
}