scm accept 子命令用于将变更集接受到存储库工作空间。如果在本地工作空间中运行此子命令,那么接受的变更集还将被装入到本地工作空间。
scm accept [ -r | --repository-uri ] repository URI or nickname [ -d | --dir ] workspace-path { [ [ -q | --quiet ] | [ -v | --verbose ] ] [ -s | --source ] source workspace or stream [ -t | --target ] target workspace or stream [ -i | --in-place-markers ] change set ... }
scm accept [ -r | --repository-uri ] repository URI [ -u | --username ] user ID in repository [ -P | --password ] password for user ID in repository
[ -d | --dir ] workspace-path { [ [ -q | --quiet ] | [ -v | --verbose ] ] [ -s | --source ] source workspace or stream [ -t | --target ] target workspace or stream [ -i | --in-place-markers ] change set ... }
<<<<<<< mine
Change in repository workspace before the accept
=======
Change from change set accepted into repository workspace
>>>>>>> proposed
C:\local-workspaces\HelloJazz>scm status
工作空间:(1101)“HelloJazz”<->(1102)“HelloJazz Stream”
组件:(1103)“HelloJazz”
基线:(1104)2“base”
传入:
变更集:
(1106)--$ 57286“接受团队邀请时发生伪存储库错误”
C:\local-workspaces\HelloJazz>scm accept 1106
正在将来自“HelloJazz Stream”的更改接受到“HelloJazz”
没有要流动的基线。
正在下载文件...
正在下载 /com.example.hellojazz.rcp.ui/src/com/example/hellojazz/rcp/ui/actions/HelloJazzAction.java(3.4 KB)
下载完成。
变更集
组件“HelloJazz”
(1106)
--m- /com.example.hellojazz.rcp.ui/src/com/example/hellojazz/rcp/ui/actions/HelloJazzAction.java
冲突