Eclipse SVN aborting commit: ' XXXXXXXX ' remains in conflict

SVN submitted a new code, always error "aborting commit: ' XXXXXXXX ' remains in conflict"

So began to search for solutions, the network is mostly a separate use of the SVN solution, in which the causes and consequences of the more detailed is this article:

Http://blog.sina.com.cn/s/blog_5d2673da0100i78k.html

It's too complicated to be good for combat. After reading still do not know how to solve, so with a very stupid method, manually deleted the temporary file and submit, although the submission is successful but this method is too violent undesirable.

Later found this article, feel very practical, hereby remember

http://blog.csdn.net/alan_sss/article/details/7673239

SVN conflict resolution in Eclipse:

1. Click Submit, error--' SVN submit ' has encountered a problem.

2. Select the file that cannot be submitted, and click Update Action. Three more files, respectively: ". Mine" "R (xxx+1)" "R (XXX)" Where xxx is the version number. ". Mine" is the file that I want to submit, ". R (XXX)" is the version of the file that I have modified after the conflict. "R (xxx+1)" is currently the current SVN server version of the content is this.

3. We manually process the source files ". Java "To get the files that you really want to upload to SVN. Right-click the team-> mark to resolve. By default, select the first "mark for conflict Resolution" and click OK. Just three files will disappear, leaving their source files.

4. Edit the source file for yourself to really want the latest version of the file on the SVN server. Right-click team-> Commit, conflict resolution.

Eclipse SVN aborting commit: ' XXXXXXXX ' remains in conflict