svn合并沖突中英文對照表
postpone 推遲

Skip this conflict and leave it unresolved 「跳過此沖突并將其保留為未解決狀態(tài)」

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.“調(diào)情”和“點其余”」

Mark as resolved Accept the tile as it appears in the working copy 「標記為已解決接受工作副本中顯示的磁貼」