svn locked提交时锁了Quit resolution解决方法cleanup再revert回退上一版本

开始

PS D:\x\BaiduSyncdisk\apptianjiebao\application\admin> svn cleanup
PS D:\x\BaiduSyncdisk\apptianjiebao\application\admin> svn update
Updating '.':
G    controller\Order.php
   C controller\Order0513.php
Updated to revision 50.
Summary of conflicts:
  Tree conflicts: 1
Searching tree conflict details for 'controller\Order0513.php' in repository:
Checking r50... done
Tree conflict on 'controller\Order0513.php':
A new file appeared during update to r50; it was added by lumeng in r50.
A file scheduled to be added to the repository in the next commit was found in the working copy.
Select: (p) Postpone, (r) Mark as resolved, (m) Merge the files, (h) Help,
        (q) Quit resolution:

解决方法：

右击进入cmd命令行

svn cleanup

svn update

还是报错

鼠标右击该文件，选择revert，回退版本（反正是r开头的，好像是这个

然后就好了。

结束