Use of SVN in Android Studio

1.Android Studio Installation

Chinese Group official website: http://www.android-studio.org/

FAQ reference:

Branch conflict Merge http://blog.csdn.net/tearsmo/article/details/6778143

Http://blog.sina.com.cn/s/blog_60f823dd01011ccj.html

Http://www.360doc.com/content/11/0614/11/621500_126833581.shtml

SVN and git comparison: http://blog.csdn.net/a117653909/article/details/8952183

Git usage reference: git-for-windows

Git-Easy Guide

"Git-book"

SVN conflict Issue: SVN version conflict resolution

http://blog.csdn.net/windone0109/article/details/4857044

Toggle Project View: You can see the catalog results for the entire project under projects. The Android directory only focuses on the app directory structure

DDMS

Http://www.it165.net/pro/html/201405/13843.html

2.VCS Configuration

VCs using (SVN) Subversion

Version Tools comparison

Http://www.cnblogs.com/greenmile/archive/2010/04/20/VCS.html

SVN installation reference Windows SVN build

Server side: http://subversion.apache.org/packages.html

TORTOISESVN Client Website: http://tortoisesvn.net/downloads.html

Server-side configuration: Install SVN server, add warehouses, add users, configure warehouse access permissions to use

Client usage Instructions:

Using the Explorer right-click: Create a folder to store the warehouse project right-click Checkout

Relocation requires server address selection

About SVN operations

Http://www.cnblogs.com/jx270/archive/2013/03/04/2943595.html

Http://www.it165.net/pro/html/201404/11412.html

Note: each time you use SVN, you update first, then commit.

Checkout SVN on the project

Select Subversion

Import the project to the SVN server,

Import into Select Subversion

Click Add Service address for example

Browse the project folder on the SVN server

SVN repository will show file list

Other Notes

Single file check-in when file, right-click Subversion Add

File red: Indicates that the file was not added to the server

Green: Indicates that no new modifications have been updated to the server

Normal Black: Indicates synchronization with server

Folder Color Description

Reference: http://blog.csdn.net/niu_hao/article/details/6774471

Yellow exclamation point (there is conflict):-This is a conflict, the conflict is that you have modified a file, others have modified the file, others to commit before you submit, then you will be prompted to submit the conflict, not allow you to submit, to prevent your submission to cover the other people's changes. To resolve the conflict, if you confirm that your changes are invalid, then use TSVN to restore your changes, if you think your changes are correct, the other person's submission is invalid, then use TSVN first labeled "Resolve Conflict", then you can submit; If you think your changes and other people's changes are part of the effective , you can manually merge other people's changes into your changes and then use TSVN to label "resolve conflicts" and then submit them. Go to the folder and look for files with a yellow exclamation point, which is where the conflict occurs, dealing with the conflict meter font size (with locally modified code):--This means you have uncommitted local code. Hello (newly added resources):--This indicates that the file is a new file resource in the project, the new resources can be files, pictures, code and so on.

The red exclamation point (the local code is not consistent with the library):--This means that the local code is not consistent with the library, and if the user wants to fix it, it can delete the red exclamation mark icon file and update it directly. Gray Rightwards Arrow (locally modified)--local code is not on the library in time. Blue left arrow (modified on SVN)--Remember to update the code and modify it before committing to the SVN comparison habit. Gray to the right and there is a plus arrow in the middle (local more than SVN files)--After the modification, remember to keep with SVN blue left and a plus arrow in the middle (svn more than the local file)-delete the file, updated again, the SVN file all updated. Gray to the right and a minus arrow in the middle (deleted locally, and SVN files not deleted)--that is, after you delete the confirmation, be sure to remember the library, with SVN consistent blue to the left and a minus sign in the middle of the arrow (SVN deleted, and the local not deleted files)--than the code on the SVN library, After you have determined that you need to delete, update svn (remove useless code). Red two-way arrows (modified on SVN, locally modified files)-This means that both local and SVN have been modified, preferably by merging local modifications to SVN, and then updating the code before modifying it.

File Status Description:

Single file check-in check-out operation: Right-click Subversion

Add, adding to the server

Commit: Submit

Update: Updated to get new version

Integrate: Merging

Note: SVN and VSS are different before checking in if a file is modified by someone else need to compare version how other modifications are valid require a merge check-in

Entire Project update submission: Commit, update

Referencing third-party jar packages: Getting Started with Android studio-referencing jars and so files

Use of SVN in Android Studio