1. 当svn up时遇到“Skipped 'device/realtek/rtd299x_tv013/apps/apps_tclodm/PublicTv' -- Node remains in conflict ” 时,解决方法如下:
svn remove --force device/realtek/rtd299x_tv013/apps/apps_tclodm/PublicTv
svn resolve --accept=working device/realtek/rtd299x_tv013/apps/apps_tclodm/PublicTv
svn up