Android Studio must encounter problems using SVN: Commit * * File out of data problem resolution

Reprint Please specify: http://blog.csdn.net/lrs123123/article/details/44829579

The use of Android Studio has become more and more a trend, and with the use of the version Control tool SVN, but also more and more enterprises, the best choice for the team, this article does not describe how to configure these, just share the SVN commit process frequently encountered problems:commit Fail: "**file out of data" the solution to the problem and the cause of the problem

Cause: A file that you want to commit has been committed, and you didn't updata down to make sure the code was consistent with the code on SVN and wanted to commit again.

Workaround:

In order to prevent your already changed things to be covered, it is best to follow the following steps to go ahead.

First of all, let the error again, that is, commit again (note, do not updata), and then look at the log, to see what files he is talking about, such as now is Myapp.java this file commit Fail error, then, you just, once again commit, note, Check out this file in the diagram.

Click Commit, and you won't be afraid your code is missing.

The next is to deal with the conflict file, such as now is Myapp.java this file, then how to do it, very simple

Start with your MyApp. Ctrl + A Select all, CTRL + C copy, and then back up, click the Updata button

When the Updata is finished, open MyApp, and you will see this other commit conflict file code long what (remember to copy the conflicting files you previously copied), this time, we will compare, and then consolidate two conflicting files in the code, again commit, OK, The problem is so pleasant to solve.

I am Lin Garry, happy to share, welcome to Exchange

Android Studio must encounter problems using SVN: Commit * * File out of data problem resolution