Fee System of the partner edition Data Center (I)-Common Errors in SVN

It took less than a month for the partner data center to complete. Our group is Xiao, Xiao Chen, and I. During this period of time, I learned a lot from this cooperation, and learned to accept and undertake it.

When we started to cooperate with the data center, the club and the Division gave us lessons and said that you should use SVN well. This is the core of cooperation. It tests the cohesion of a Group. At the beginning of the cooperation, the team lead assigned me the idea of building SVN. At that time, I remember I had just finished learning SVN. All versions and plug-ins must be tested. We use:

The complete set will not result in incompatibility.

SVN Theory

I remember when I first learned SVN, I wrote a summary:

Http://blog.csdn.net/qiumuxia0921/article/details/37317201

Here I drew a picture in it:

Well, now let's take a look at this figure. I used to only know it. When the cooperation is finished, I find that there is a lot of knowledge.

First, let's talk about the principles of the version Library:

For example, after I update a version of "132", I modify it on this version, and after the modification, I update it to "133". At this time, I should first update my version to "133" to avoid conflicts and then submit.

Explanation:

First, let's take a look at how SVN works:

Let's take a look at this figure: as long as you open the project, you must first update it to the latest version. Do not forget this. After that, check for modification (that is, update ), in fact, it is to prevent conflicts. If a conflict exists, it is necessary to resolve the conflict before committing the commit statement. Otherwise, the conflict will be submitted, so that updates of people in the same group will conflict.

Ii. SVN code process

What is the process of updating the svn server to the local server, modifying the code, and updating the Code to the server?

In fact, the above are some professional terms to explain what we usually use. The trunk code of the svn service is downloaded using the svn checkout command, and the code update is update. A local workspace is generated, and we can modify the code locally, code, when we update the code again, the code we write will not disappear, but the mine will be generated when we make changes. In this way, we select the code we want and delete unnecessary code, commit.

Third, the symbols in SVN:

Of course, there are more than three SVN icons. There are a total of six icons, which I have never seen before. So here, I will talk about these three:

This is the icon that appears after we modify the code locally. Update and commit will be OK.

A yellow icon is a conflict. When a conflict occurs, update will look like this:

In general, just solve it. If you upload the file directly, the following error occurs:

To solve this problem, delete it and update it.

Summary:

The above are some of the experiences in applying Svn in our group, hoping to help you later. SVN is an important means of communication during cooperation. SVN teaches us how to cooperate, how to communicate, how to accept, and how to undertake.

Fee System of the partner edition Data Center (I)-Common Errors in SVN