SVN更新提示冲突时各选项的意思SVN 更新发生冲突时各选项的意思

57 阅读 0 评论 38 点赞

我是靠谱客的博主虚拟薯片，最近开发中收集的这篇文章主要介绍SVN更新提示冲突时各选项的意思SVN 更新发生冲突时各选项的意思，觉得挺不错的，现在分享给大家，希望可以做个参考。

概述

SVN 更新发生冲突时各选项的意思

svn up时，提示无法更新，使用svn up --force强制更新
有时会弹出如下提示

Conflict discovered in 'css/home.css'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options:

可以选择df查看冲突信息。
以下是每个选择的意思：

(e) edit - change merged file in an editor #直接进入编辑
(df) diff-full - show all changes made to merged file #显示更改至目标文件的所有变化
(r) resolved - accept merged version of file

(dc) display-conflict - show all conflicts (ignoring merged version) #显示所有冲突
(mc) mine-conflict - accept my version for all conflicts (same) #冲突以本地为准
(tc) theirs-conflict - accept their version for all conflicts (same) #冲突以服务器为准

(mf) mine-full - accept my version of entire file (even non-conflicts)#完全以本地为准
(tf) theirs-full - accept their version of entire file (same) #完全以服务器为准

(p) postpone - mark the conflict to be resolved later #标记冲突，稍后解决
(l) launch - launch external tool to resolve conflict
(s) show all - show this list