svn conflicts: local delete, incoming delete upon update

svn  st查看更新的时候发现存在conflicts,提示很多 local delete, incoming delete upon update ，

 $:svn st
 ?     C IMIRROR.T3A.000.000.T28.img
       >   local delete, incoming delete upon update
 ?     C IMIRROR.T3A.000.000.T33.img
       >   local delete, incoming delete upon update
 ?     C IMIRROR.T3A.000.000.T34.img
       >   local delete, incoming delete upon update
 ?     C chips/sun8iw11p1/configs/default/0sys_partition_linux.fex
       >   local delete, incoming delete upon update
 ?     C chips/sun8iw11p1/configs/default/1sys_partition_linux.fex
       >   local delete, incoming delete upon update
 ?     C chips/sun8iw11p1/configs/default/2sys_partition_linux.fex
       >   local delete, incoming delete upon update
 ?       chips/sun8iw11p1/configs/t3-p3/1280_400_sys_config.fex
 ?       chips/sun8iw11p1/configs/t3-p3/1920_480_sys_config.fex
 D       out/0sys_partition.fex
 ?       out/1280_400_sys_config.fex
 ?       out/1920_480_sys_config.fex
 D       out/1sys_partition.fex
 D       out/2sys_partition.fex
 M       out/Vboot-resource.fex
 M       out/Vboot.fex
 M       out/Vrootfs.fex
 M       out/boot-resource.fex
 M       out/boot_package.fex
 M       out/config.fex
 M       out/sunxi.fex
 M       out/sys_config.bin
 M       out/sys_config.fex
 M       out/sys_config_fix.fex
 M       out/u-boot.fex
 ?     C sun8iw11p1_linux_t3-p3_uart0.img
       >   local delete, incoming delete upon update
 Summary of conflicts:
   Tree conflicts: 

解决办法：

1、先 revert 冲突文件

 $：svn revert   IMIRROR.T3A.000.000.T28.img  IMIRROR.T3A.000.000.T33.img   IMIRROR.T3A.000.000.T34.img    sun8iw11p1_linux_t3-p3_uart0.img  chips/sun8iw11p1/configs/default/0sys_partition_linux.fex   chips/sun8iw11p1/configs/default/1sys_partition_linux.fex    chips/sun8iw11p1/configs/default/2sys_partition_linux.fex
 Reverted 'IMIRROR.T3A.000.000.T28.img'
 Reverted 'IMIRROR.T3A.000.000.T33.img'
 Reverted 'IMIRROR.T3A.000.000.T34.img'
 Reverted 'sun8iw11p1_linux_t3-p3_uart0.img'
 Reverted 'chips/sun8iw11p1/configs/default/0sys_partition_linux.fex'
 Reverted 'chips/sun8iw11p1/configs/default/1sys_partition_linux.fex'
 Reverted 'chips/sun8iw11p1/configs/default/2sys_partition_linux.fex'

2、删除掉冲突文件。

 $:rm  IMIRROR.T3A.000.000.T28.img   IMIRROR.T3A.000.000.T33.img    IMIRROR.T3A.000.000.T34.img   chips/sun8iw11p1/configs/default/0sys_partition_linux.fex  chips/sun8iw11p1/configs/default/1sys_partition_linux.fex  chips/sun8iw11p1/configs/default/2sys_partition_linux.fex   sun8iw11p1_linux_t3-p3_uart0.img 

3、重新checkin

$:svn ci -m "message log" file1 file2