svn 处理冲突（一）

1、比如：a.java产生冲突，已经解决之后，务必使用以下命令通知svn，此冲突已解决。svn resolve --accept 当前目录下文件名
2、过程中，svn一些状态标志：
A：add，新增
C：conflict，冲突
D：delete，删除
M：modify，本地已经修改
G：modify and merGed，本地文件修改并且和服务器的进行合并
U：update，从服务器更新
R：replace，从服务器替换
I：ignored，忽略
3、解决冲突，使用到：
Conflict discovered in /Users/apple/EtaxiAppServer/common/src/com/yaotaxi/db/MongoDBHelper.java’.

Select: § 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 #显示更改至目标文件的所有变化
® 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) #完全以服务器为准
§ postpone - mark the conflict to be resolved later #标记冲突，稍后解决
(l) launch - launch external tool to resolve conflict
(s) show all - show this list

4、遇到问题：在清理本地仓库分支下文件，报 SVN: is scheduled for addition, but is missing

解决方式：revert，然后再对文件执行下一步操作。
应该还有别的方式。。。