What to consider in the actual application of SVN

1. Client Version ( Eclipse plugin version)

The client version corresponds to the server version, and the client version is unified with the version of the development tool.

The large version number should be consistent, such as: The client is 1.6., and Eclipse 's svn plugin is 1.6. x ,x does not make the request.

2. Rigorous copying of folders under version control

3. 
   

Colleagues who have used svn should know thatSVN puts some version control information on the client, the client's version information file, and the hidden ". SVN" folder (which appears under each folder under version control).

In the actual application, we tend to copy a completed module of the folder and the files inside, and then a little change, then become another module related files. This is not an option, but do not copy it with the hidden ". SvN" folder, otherwise the version commits confusion.

More secure method:1, only copy files,2, do not have version control export, modified after submission;

3. Export without version control

4. What is conflict, and conflict resolution

The conflict can be easily understood as, many people modified, the same version of the same file location, when SVN did not judge, accept the person's changes, so svn will throw a conflict.

For example:

Edit conflict

As you can see, line 3 has a conflict, one side is "11111111111111111", one side is "2222222222222"

At this point, the need for artificial judgment, accept the changes, and accept the "2222222222222" modification.

Resolve Conflicts

5. Get the latest version before changing, lock

6. 
   

No matter when you get the latest version, make sure to remove the latest version, lock, modify, submit (unlock) before changing.

6. Submit the version in a timely manner and submit a version with comments

Submit the version in a timely manner, when your work has progressed in stages, to submit a version, in order to have a backup, such as the creation of all directories, for the program, must be run without error to submit.

7. View historical version and version comparison

8. 
   

8. Modify file name

9. 
   

After the modification, submit.

What to consider in the actual application of SVN