Shulou(Shulou.com)06/02 Report--

This article introduces you what is the idea of the Git version, the content is very detailed, interested friends can refer to, hope to be helpful to you.

To put it simply, there are two major schools of git's management strategy. I can also feel it when chatting with colleagues or communicating with friends in other companies, namely Git One Track and Git-flow. Phellodendron mandshurica (Thunb.)

A track.

One Track simply means that the whole team is working on the same branch when developing the project. This means that all the work in the development phase is concentrated in the same branch, such as the development of new features and bug fixes. Of course, the One Track strategy does not mean that there is only one branch, but only one development branch. When the milestone set by the team is reached, a new branch can be opened to maintain this basically stable version, which only does maintenance work, not development work. At the same time, the development branch continues to do the latest development work. Phellodendron mandshurica (Thunb.)

The most important feature of using this strategy is that everyone works on the same branch, so there may be conflicts every time the code is submitted. In order to reduce conflicts, teams often increase the frequency of submissions, and the granularity of each submission is small. At the same time, the management cost is relatively low, and the learning cost of the whole team is also relatively low. Phellodendron mandshurica (Thunb.)

In my previous project, I worked with a team that just switched from svn to git, and we used the way One Track works for some time, and we can see that this strategy is good for the whole team to engage and adapt to git. Phellodendron mandshurica (Thunb.)

But I believe more people prefer another strategy, that is, the Git-Flow strategy. Phellodendron mandshurica (Thunb.)

Gitflow coach

First of all, I'm sure a lot of people must have seen the following picture somewhere:

This picture already illustrates gitflow very well. That is, any change is a branch. Phellodendron mandshurica (Thunb.)

As you can see, although there are many branches in this picture, they can be broadly divided into two categories. That is, the main branch and the auxiliary branch. Phellodendron mandshurica (Thunb.)

Main branch

The main branch is the default mater branch of git and a main development branch, develop. Phellodendron mandshurica (Thunb.)

The master branch is the default master branch of git, and the team usually does not develop on this branch. The main development branch develop manages the code submitted by the developer. When the code is stable or fixed for a period, the code on the develop branch is merged into the main branch. Phellodendron mandshurica (Thunb.)

Auxiliary department

The secondary branch is accessible to every developer of the team, and common auxiliary branches include:

Functional subject

Publishing company

Repair branch company

All three branches have their own usage scenarios. Phellodendron mandshurica (Thunb.)

When developing a new function, it is necessary to create a new function branch from the main development branch, and then merge the main function branch after the function development on that branch is completed. Phellodendron mandshurica (Thunb.)

The release branch is the branch created at the time of the release, including the functions that should be completed according to the requirements of the product milestone. Phellodendron mandshurica (Thunb.)

The repair branch is when the bug appears, in order not to affect the development branch, so create a new branch to modify the bug, and then merge back to the development branch. Phellodendron mandshurica (Thunb.)

So we can see that GitFlow's strategy is to develop functionality and repair bug in a branching manner. The advantage of this, of course, is that the management is very clean. However, because the function development time is relatively long and the granularity of code submission is relatively large, conflicts may occur during branch merger. another problem is that the requirement for the whole team is larger than the One Track strategy. Phellodendron mandshurica (Thunb.)

However, there is no perfect solution, and some are just more suitable for the team. For example, many teams, including me, prefer to mix the two methods. For example, if One Track is developed on the same branch, it may not be clean enough, so we can properly open a new branch for development. In view of the large code granularity and many conflicts in the era of GitFlow commit and merge, we synchronize the code once a day instead of waiting for the whole function to be completed and then merged into the main development branch. Phellodendron mandshurica (Thunb.)

On the Git version of what is shared here, I hope that the above content can be of some help to you, can learn more knowledge. If you think the article is good, you can share it for more people to see.

Welcome to subscribe "Shulou Technology Information " to get latest news, interesting things and hot topics in the IT industry, and controls the hottest and latest Internet news, technology news and IT industry trends.