svn更新出现冲突的解决方法

今天从服务器更新java代码时，出现如下冲突

 

 

Conflict discovered in '/Users/apple/EtaxiAppServer/common/src/com/yaotaxi/db/MongoDBHelper.java'.

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

 

 

由于我是从服务端更新，所以直接 用 tf  命令就可以啦。

 

 

最后 由于春运快到了，给大家安利一个抢火车票的小程序心到抢票，微信扫码关注点击立即抢票即可

个人亲测效率很高，大家也可以加他们官方微信  xdticket  咨询。