svn合并冲突中英文对照表
postpone 推迟
Skip this conflict and leave it unresolved 「跳过此冲突并将其保留为未解决状态」
Accept base Discard local and incoming changes for this file 「接受基本放弃此文件的本地和传入更改」
Accept incoming Accept incoming version of entire file 「接受传入接受整个文件的传入版本」
Reject incoming Reject all incoming changes for this file 「拒绝传入拒绝此文件的所有传入更改」
Accept incoming for conflicts Accept changes only where they conflict 「接受传入冲突仅接受冲突处的更改」
Reject conflicts 「拒绝冲突」
Reject changes whi. h."Flict and""pt the rest 「拒绝更改。H.“调情”和“点其余”」
Mark as resolved Accept the tile as it appears in the working copy 「标记为已解决接受工作副本中显示的磁贴」
