1. check out
svn co svn://xxx.xxx.xxx.xxx/xxx/xxx
2. update
svn up
3. update后发现conflict
svn up
tc
4. 当遇到如下情况:
Skipped 'emotion' -- Node remains in conflict
Summary of conflicts:
Skipped paths: 1
可以用如下解决方式:localhost:image michael$ svn resolve --accept=working emotion
Resolved conflicted state of 'emotion'
localhost:image michael$ svn up
Updating '.':
D emotion
Updated to revision 10943.