Android Studio uses SVN inevitably to encounter problems: 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 increasingly a trend. and the combination version number Control tool SVN use, is also more and more enterprises. The best choice for your team. This document does not describe how to configure these. Share only a few common problems with the SVN commit process:commit fail: "**file out of data" solution to the problem and the solution of the problem

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

The workaround:

To prevent the things you have changed are covered. It's best to follow the steps below.

First of all. Let the error reappear again, that is, commit again (note, do not updata). Then look at the log, and see what files he is talking about, for example, now it is Myapp.java, this file is a commit Fail error, then you just have to. Commit again, note. Check out this file in the diagram.

Click Commit to this point. You won't be afraid that 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 easy

Start with your MyApp Ctrl + A Select all, CTRL + C copy. And then backup it well. Click Updatabutton

After the Updata is finished. Open MyApp. At this point you will see what the conflict file code looks like for someone else's commit (remember to back up the conflicting files you copied earlier). At this time, we have to control, and then integrate the code in two conflicting files, again commit, OK, the problem is so happy to solve.

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

Android Studio uses SVN inevitably to encounter problems: Commit * * File out of data problem resolution