svn co 有冲突 文件Summary of conflicts:

 [root@localhost ceshi-wwwcn]# svn up

Skipped 'config/config.php'

At revision 1897.

Summary of conflicts:

  Skipped paths: 1 //之前我按了个p

 

 

解决

[root@localhost ceshi-www967067cn]# svn resolve --accept working config/config.php

Resolved conflicted state of 'config/config.php'

[root@localhost ceshi-www967067cn]# svn up

G    config/config.php

Updated to revision 1897.

转载于:https://blog.51cto.com/sndapk/1056200