Introduction to several common Version Control Software

If you are a single person, and never want to letCodeBack to the status n long ago, you can directly ignore thisArticleOtherwise, love it...

Lexicon:Repository, trunk, branch, and revision)

Common version control software includes the following:SVN, git, mercurial, and VSS are described respectively.

// Certificate //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Subversion  (SVN for short) ) Is a version management software that has emerged in recent years, and is a CVS Successor. Currently, the vast majority of open-source software All use SVN As code version management software .

Subversion stores files in the central version Library . This version library is similar to a common file server. The difference is that it can record every file and directory modification. In this way, data can be restored. In the previous version, you can view the data change details. Because of this, many people regard the version control system as a magic "time machine ".

Classic workflow:

1. download the latest code of the project team from the server. 2. Go to your own branch and work. Submit the code to your branch at intervals. 3. When the off-duty time is approaching, merge your branches into the master branch of the server. The work is completed in one day and reported to the server. Tutorial: http://wenku.baidu.com/view/aa148e66783e0912a2162a3a.html

 

// Certificate //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------

git is an open-source distributed version control system, effective and high-speed project version management from very small to very large

the biggest difference between distributed and centralized systems is that developers can submit data locally. Each developer machine has a server database

Classic git Development Process:

1: Clone the database (including code and version information) from the server to the single machine.

2: Create a branch on your machine and modify the code.

3: Submit code on the Branch created on the standalone.

4: merge branches on a single machine.

5. Create a new branch, run the latest version of the Code fetch on the server, and merge the Code with your main branch.

6: generatePatch(Patch) to send the patch to the primary developer.

7: Based on the feedback from the primary developers, if the primary Developers find that there is a conflict between the two general developers (they can work together to solve the conflict), they will be asked to resolve the conflict first, then one of them submits the request. If the primary developer can resolve the issue by themselves or there is no conflict, it will pass.

8: Methods for resolving conflicts between developers, developers can use the pull command to resolve the conflict. After the conflict is resolved, the patch is submitted to the primary developer .

// Certificate //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Mercurial

 

The specific comparison is as follows:

 

Http://article.yeeyan.org/view/243154/211055

// Certificate //-------------------------------------------------------------------------------------------------------------------------------------------------------------------------

VSSMicrosoft's things, and can be used by beginners. There are too few other users.