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 file ". Java" and 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.
SVN conflict resolution in eclipse
