夜空

 今天对服务器上的svn库进行svn up遇到Conflict discovered in '**/****.php'.问题,刚开始还以为是svn锁定了,使用svn cleanup再进行svn up还是出现相同的问题.网上google了下发现原来是因为subversion发现了local work copy和repository上的不一致,需要svn用户自己裁决,需要直接输入tf.如下图.

如果记不清楚各个选项的含义,可以输入s了解.另外,如果不确定自己是否更改了本地的project文件,可以输入dc了解本地代码和repository上的差异.详细介绍可参考:http://www.logicaltrinkets.com/wordpress/?p=178,写的挺清楚的,英文的.

Conflict discovered in ‘****/****.php’.
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

Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: tf 

夜空- 本站版权

1、本站所有主题由该文章作者发表，该文章作者与夜空享有文章相关版权
2、其他单位或个人使用、转载或引用本文时必须同时征得该文章作者和夜空的同意
3、本帖部分内容转载自其它媒体，但并不代表本站赞同其观点和对其真实性负责
4、如本帖侵犯到任何版权问题，请立即告知本站，本站将及时予与删除并致以最深的歉意
5、原文链接：blog.slogra.com/post-187.html

标签: 更新 svn up Conflict discovered in