zoukankan      html  css  js  c++  java
  • svn更新出现冲突的解决方法

    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: 
    
    
    
    (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  命令就可以啦
    生命不止,奋斗不息
  • 相关阅读:
    SQL server 事务介绍,创建与使用
    DOM操作系列-01
    JS键盘事件
    Js获取当前日期时间及其它操作
    js中!!的作用
    js == 与 === 的区别[转]
    学习总结--Dom
    css历史
    javascript中 visibility和display的区别
    “==”和Equals区别
  • 原文地址:https://www.cnblogs.com/shione/p/7421973.html
Copyright © 2011-2022 走看看