2022.04.14-About code version management SVN/GIT understanding, TortoiseSVN/GitHub

Why did you search for this article?

I simply guess what you are thinking is: I need something that can save my code in the cloud and allow everyone to modify a copy of the code together.

1. Principle... Why do we need to understand the distributed version control system, that is, why do we need to understand the version control and code management of projects/systems/software?

        When you create and develop a project, you always need a warehouse that can store your project code. Of course, your local computer can also do it, but when multiple people collaborate, everyone can’t copy a copy and form an alliance, or When you need to manage the update and record history of each function in batches, roll back versions and open warehouses, etc., svn/git solves this problem.

1.1. Simply say what is Svn / Git?

        They are all version control tools, they all need to be downloaded and installed, and they can be used to submit/pull/clone code and other operations, that is, they are a content transmission tool with the above operations.

1.2. Where are they going to be transferred? What is GitHub/Gitee/GitLab?

        They all need to be transferred to a warehouse, a large open cloud warehouse, or a local self-built warehouse. The most famous of these warehouses are GitHub (the largest foreign warehouse/the largest dating platform with the same surname), gitee (the largest domestic warehouse), GitLab (local/built by your own server), Svn is equivalent to GitLab, and generally the server builds svn Private repository, transfer and version control via svn tool.

1.3. What are the open source clients of transmission tools?

        Install Svn/Git, which is the basic transmission tool. Of course, you are familiar with commands at this time, and you can directly use commands to complete a series of version control operations. The commonly used visual free open source clients include TortoiseSVN (for Svn), GitHistory plug-in of VsCode, TortoiseGit plug-in of Hbuider, Git/Svn plug-in of IDEA editor, Sourcetree (both Svn and Git can be used).

2. Operation... Now that I have tools, how do I use them?

        For me, I don't like to read long articles, it's very annoying to read, and I feel that I can't understand it after reading it. So what to do, practice and then ask others, summarize it yourself, and then read the long speech, you will be stable.

        Summary: Create a new code warehouse ~ Use the client to pull/clone the code ~ Modify the code/Add a file ~ Temporary storage/Add a local modification ~ Update the code ~ Submit the code  in one go.

        Afterwards, I regretted the modification, and rolled back/undone the modification. Two people modify the same file together, resulting in the submission of local code or the updated code conflicts with the local content, then you have to rush to resolve the conflict. There are three operations to resolve the conflict. Check which codes are in the conflicting file. Change, only keep the warehouse Change the code on the cloud to remove the local code you changed , keep only your local code and remove the code changed by the warehouse , and keep both codes in the file. Only one of the three operations can be kept kind. Code conflicts are nightmares, so a good tool for viewing conflicts will make you soar, and I recommend the GitHistory plugin for VsCode. Whoever uses it knows, novices must not use the TortoiseSVN client to resolve conflicts, it will not die or be disabled.

2.1. Having said so much, how do you get started?

        Hey, I'm afraid it's too long and you don't want to read it. I broke it down. Please see the specific routine operations.

2022.04.13-SVN Quick Start Tutorial

Original link: https://blog.csdn.net/m0_46551050/article/details/124153447

2022.04.14-SVN Quick Start Tutorial- Supplementary Explanation

Original link: https://blog.csdn.net/m0_46551050/article/details/124168642

2.2. You said that this is just svn, but what about git, svn is actually easier to learn. After understanding this, git will be easier to understand. It is similar with minor differences. What is the difference between svn and git? Simply put, git is distributed, svn is not. 

Guess you like

Origin blog.csdn.net/m0_46551050/article/details/124144352