文件冲突定义：svn up更新服务器文档到本地的时候发现本地的文件有所改动，和svn服务器不同步
服务器会报冲突，让你觉得已谁的为准，根据实际情况我们需要选择是以服务器还是以本地代码为准
报错：
Conflict discovered in 'framework/entity/config/entityengine.xml'.
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
在此例中国我直接使用了mf，及完全以本地为准。再次更新不再提示此问题。