前言

略

svn update 發生沖突(conflict)

Updating '.': U src/views/login/index.vue Conflict discovered in '/opt/abc/src/package-lock.json'. Select: (p) postpone, (df) diff-full, (e) edit,(mc) mine-conflict, (tc) theirs-conflict,(s) show all options: s(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

各選項含義

(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

總結

以上是生活随笔為你收集整理的svn update 发生冲突(conflict)时，各选项含义的全部內容，希望文章能夠幫你解決所遇到的問題。

如果覺得生活随笔網站內容還不錯，歡迎將生活随笔推薦給好友。