标题: svn 强制覆盖目标文件 [打印本页]
作者: xiexie 时间: 2022-7-16 16:46 标题: svn 强制覆盖目标文件
运行'svn update‘，我得到以下输出：Restored 'index.html'
U somescript.php
Conflict discovered in file.xml'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options:
解决命令：
svn up --accept tf
| 欢迎光临 PHP开发笔记 (http://phpvi.com/) |
Powered by Discuz! 6.1.0 |