Android Studio may encounter problems when using SVN: commit ** File out of data solution, androidsvn

Android Studio may encounter problems when using SVN: commit ** File out of data solution, androidsvn

Reprinted Please note: http://blog.csdn.net/lrs123123/article/details/44829579

The use of Android Studio has become a trend. The use of version control tools svn is also the best choice for more and more enterprises and teams. This article does not introduce how to configure these, just share the common problems encountered during svn commit: commit fail: "** File out of data ".

Cause: someone else has already committed the file you want to commit, but you don't need to updata to ensure that the Code is consistent with the Code on svn and want to re-commit.

Solution:

To prevent the contents from being overwritten, follow these steps.

First, let the error be reproduced again, that is, re-commit (note, do not updata first), then read the log to see which files he is talking about, such as MyApp. if the java file reports a commit Fail error, you only need to commit it again. Note that you should check this file in the figure.

Click commit. At this point, you will not be afraid that your code will be lost.

The next step is to process conflicting files. For example, if MyApp. java is used, how can this problem be solved?

Press Ctrl + A select all for your MyApp, press Ctrl + C copy, back up, and click updata.

After updata is complete, open MyApp. Then you will see what the conflicting file code on someone else's commit looks like (remember to back up the conflicting file you copied first). At this time, we need to compare, then integrate the code in the two conflicting files, and then commit again. Well, the problem is solved so happily.

I'm Lin Garry, happy to share with you. Thank you!