Multiple files appear after Update, and error! ! R.java.mine R.java.r21965 R.java.r23204
Below to automatically generate R.java.mine, R.java.r21965, R.java.r3439 Example
Because of the conflict, and others you have to r.java the files from the 3368 version was modified after the others modified form to submit a 3439 version, then you do a commit,
then you cover in order to avoid other people's revision , SVN prompt you clashed, and automatically form R.java.mine, R.java.r3368, R.java.r3439 these three files.
Where:
R.java.mine is ready to submit your own modified version of that;
R.java.r21965 is your initial version;
R.java.r23204 is time for someone else before you submit that version;
in addition, there should be a R.java is automatically merged version of your version and others submitted formation (which is marked with <<<<<, ======, >>>>> symbols such as an automatic part of the merger).
The purpose of these documents is automatically generated to facilitate you to manually merge the two of you changes. Then I suggest you look at the history of this file, take a look at this version of the 23204 who submitted,
ask him what has changed place, and then you manually merge the two of you to modify the same file r.java, and then use SVN labeled "conflict has been resolved," the extra files will be automatically deleted after the tag, then you can properly submitted.
Perhaps
find file conflict conflict right to find the Edit conflicts trimmed, saved after adjusted, right-select Resolved ... conflicts can be solved
Below to automatically generate R.java.mine, R.java.r21965, R.java.r3439 Example
Because of the conflict, and others you have to r.java the files from the 3368 version was modified after the others modified form to submit a 3439 version, then you do a commit,
then you cover in order to avoid other people's revision , SVN prompt you clashed, and automatically form R.java.mine, R.java.r3368, R.java.r3439 these three files.
Where:
R.java.mine is ready to submit your own modified version of that;
R.java.r21965 is your initial version;
R.java.r23204 is time for someone else before you submit that version;
in addition, there should be a R.java is automatically merged version of your version and others submitted formation (which is marked with <<<<<, ======, >>>>> symbols such as an automatic part of the merger).
The purpose of these documents is automatically generated to facilitate you to manually merge the two of you changes. Then I suggest you look at the history of this file, take a look at this version of the 23204 who submitted,
ask him what has changed place, and then you manually merge the two of you to modify the same file r.java, and then use SVN labeled "conflict has been resolved," the extra files will be automatically deleted after the tag, then you can properly submitted.
Perhaps
find file conflict conflict right to find the Edit conflicts trimmed, saved after adjusted, right-select Resolved ... conflicts can be solved