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