现象:
svn st custom/base_1G_2G
! C custom/base_1G_2G
本地目录编辑, 进入的目录删除 接着更新
! custom/base_1G_2G/Android.mk
! custom/base_1G_2G/product.mk
! custom/base_1G_2G/system
! custom/base_1G_2G/system/app
…
! custom/base_1G_2G/system/app/mContact/lib/armeabi
! custom/base_1G_2G/system/app/mContact.apk
冲突概要:
树冲突:1
解决方法:
第一步:svn resolve –accept working custom/base_1G_2G/
第二步:svn revert –depth infinity custom/base_1G_2G/
已恢复“custom/base_1G_2G”
已恢复“custom/base_1G_2G/system”
已恢复“custom/base_1G_2G/system/app”
已恢复“custom/base_1G_2G/system/app/mContact.apk”
…
说明:
svn resolve – 合并冲突代码
svn revert – 撤销本地修改代码
先把冲突的代码合并起来,然后再撤销本地的修改,还原到与服务器相同的状态。