xiexie

运行'svn update‘，我得到以下输出：

Restored 'index.html' U somescript.php Conflict discovered in file.xml'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options:

解决命令：

svn up --accept tf