xiehuafeng@xiehuafeng-pc:~/workspace/zhixin_bridge2/doc/trunk$ svn merge http://svn.ex.cn/svnd/ucc/platform/oa/zxbridge/doc/branches/adapt ./
svn: E200007: “http://svn.zhkj-rd.cn/svnd/ucc/platform/oa/zxbridge/doc/trunk” 不支持取回合并信息
把主干的代码合并到本地，本地时其中一个分支的代码。出现如上异常，不知道是怎么回事，还望有明白的大神告知。
另外如果我直接合并远程主干和分支，出现如下树冲突提示。请问要如何解决，我尝试一个一个resolve ，解决后再合并仍然会提示这些冲突。
xiehuafeng@xiehuafeng-pc:~/workspace/zhixin_bridge2/zxbridge/branches/mobile-adapt$ svn merge http://svn.ex.cn/svnd/ucc/platform/oa/zxbridge/trunk http://svn.ex.cn/svnd/ucc/platform/oa/zxbridge/branches/mobile-adapt
--- 正在合并版本库 URL 之间的差异到 “.”：
C zhixin-assembly/zhixin-assembly-tracker/src/main/resources/static/plugins/popmenu
C zhixin-assembly/zhixin-assembly-tracker/src/main/resources/static/css/index.css
C zhixin-assembly/zhixin-assembly-tracker/src/main/resources/static/css/common/common-card.css
C zhixin-service/zhixin-service-user/src/main/java/com/starnetuc/zhixin/support/model
C zhixin-service/zhixin-service-user/src/main/java/com/starnetuc/zhixin/support/utils
C zhixin-service/zhixin-service-user/src/main/java/com/starnetuc/zhixin/support/Globals.java
C zhixin-service/zhixin-service-user/src/main/java/com/starnetuc/zhixin/service/user/WXUserServiceFeignClient.java
C zhixin-service/zhixin-service-user/src/main/java/com/starnetuc/zhixin/service/user/TokenServiceFeignClient.java
A zhixin-service/zhixin-service-user/src/main/java/com/starnetuc/zhixin/support/model/UserResult.java
A zhixin-service/zhixin-service-user/src/main/java/com/starnetuc/zhixin/support/utils/HttpUtil.java
C zhixin-service/zhixin-service-produce-api/src/main/java/com/starnetuc/zhixin/service/out
冲突概要：
树冲突：9
树冲突于“zhixin-assembly/zhixin-assembly-tracker/src/main/resources/static/css/common/common-card.css”
> local missing or deleted or moved away, incoming file delete or move 接着合并
选择: (r) mark resolved, (p) 推迟, (q) 退出解决冲突, (h) 帮助: q
--- 记录版本库 URL 之间的合并信息到“.”：
冲突概要：
树冲突：9
