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 incoming changes which conflict and accept the rest「拒绝发生冲突的传入更改并接受其余更改」

Mark as resolved 标记为已解决
Accept the tile as it appears in the working copy「接受工作副本中显示的磁贴」