昨晚上传文件出问题了，就去更新了一下svn，但是更新完后发现出问题了，页面直接报错了，本地改没作用，就想在服务器上直接改，但是svn有报了个问题。度娘了一下，发现是因为subversion发现了local work copy和repository上的不一致,需要svn用户自己决定。

Conflict discovered in 'upload.php'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: tf

这时只需要输入tf就可以了，还有几个命令，可以输入s查看

Conflict discovered in ‘upload.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 
意思都写的挺清楚的，不懂就去翻译一下。