今天更新svn是报错
[[email protected]*****-04 webapps]$ svn up
Updating '.':
Skipped 'christmas' -- Node remains in conflict
At revision 133.
Summary of conflicts:
Skipped paths: 1
*****-04 [[email protected]*****-04 webapps]$ svn up
Updating '.':
Skipped 'christmas' -- Node remains in conflict
At revision 133.
Summary of conflicts:
Skipped paths: 1
*****-04