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

lumengabc

于 2023-05-27 22:01:19 发布

阅读量434

点赞数

CC 4.0 BY-SA版权

分类专栏：版本控制文章标签： php 开发语言

本文链接：https://blog.youkuaiyun.com/webnoties/article/details/130906609

版本控制专栏收录该内容

16 篇文章

订阅专栏

在执行`svncleanup`和`svnupdate`后，仍遇到树冲突。针对controllerOrder0513.php文件，通过右击选择revert回退到旧版本以解决冲突。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

开始

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开头的，好像是这个

然后就好了。

结束