SVN remains in conflict?

svn remove --force yourfilename
svn resolve --accept=working  yourfilename
svn commit -m ""

转自： http://blog.csdn.net/hufengvip/article/details/8306893

更完整的：http://stackoverflow.com/questions/2406469/svn-remains-in-conflict

http://stackoverflow.com/questions/4317973/svn-how-to-resolve-local-edit-incoming-delete-upon-update-message

一般情况下用 
svn resolve --accept=working  yourfilename
Long version:
This happens when you edit a file, while someone else deleted the file and commited first. As a good svn citizen you do an update before a commit. Now you have a conflict. Realising that deleting the file is the right thing to do, you delete the file from your working copy. Instead of being content, svn now complains that the local files are missing, in addition to the conflicting update which ultimately wants to see the files deleted. Good work, svn.
02 用法: resolve --accept=ARG [PATH...] 
03   
04   注意:  当前需要选项 --accept 。 
05   
06 有效选项: 
07   --targets ARG            : 传递文件 ARG 内容为附件参数 
08   -R [--recursive]         : 向下递归，与 --depth=infinity 相同 
09   --depth ARG              : 受深度参数 ARG(“empty”，“files”，“immediates”，或“infinity”) 约束的操作 
10   -q [--quiet]             : 不打印信息，或只打印概要信息 
11   --accept ARG             : 指定自动解决冲突动作的源 
12                             ('base', 'working', 'mine-conflict', 
13                              'theirs-conflict', 'mine-full', 'theirs-full') 
14   
15 全局选项: 
16   --username ARG           : 指定用户名称 ARG 
17   --password ARG           : 指定密码 ARG 
18   --no-auth-cache          : 不要缓存用户认证令牌 
19   --non-interactive        : 不要交互提示 
20   --trust-server-cert      : 不提示的接受未知的 SSL 服务器证书(只用于选项 “--non-interactive”) 
21   --config-dir ARG         : 从目录 ARG 读取用户配置文件 
22   --config-option ARG      : 以下属格式设置用户配置选项： 
23                                  FILE:SECTION:OPTION=[VALUE] 
24                              例如： 
25                                  servers:global:http-library=serf
常用操作
1、svn update后，1.txt文件出现冲突，选择base版本，即1.txt.rOld作为最后提交的版本
$ svn resolve –accept base
2.手工修改1.txt文件，然后将当前拷贝即1.txt作为最后提交的版本
$ svn resolve –accept working 1.txt
3.使用1.txt.rNew作为最后提交的版本
$ svn resolve –accept theirs-full 1.txt
4.使用1.txt.mine作为最后提交的版本 
$ svn resolve –accept mine-full 1.txt
5.使用1.txt.mine作为最后提交的版本 
$ svn resolve –accept theirs-conflict 1.txt