svn本地与服务器文件冲突
$ svn update Conflict discovered in 'readme.txt'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict,
注：这里我们选择postpone, 延缓处理，查看文件readme.txt，内会有冲突记录。修正后执行如下命令
$ svn resolve --accepting working reademe.txt