svn冲突解决

$ svn update  
正在升级 '.':  
已跳过 'android' -- 节点处于冲突状态  
版本 7657。  
冲突概要：  
  跳过的路径：1

svn resolve --accept working android  //解决svn树冲突
#**android**的冲突状态已解决
svn revert android  //取消所有的本地编辑(可选)

$ svn up
Conflict discovered in ‘test.txt’.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options:
svn detects that theres a conflict here and require you to take some kind of action.
If you type ‘s’ here you will get a list of the commands and meaning

(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