Code branch management method and device

Abstract

The invention provides a code branch management method and device, and the method comprises the steps: obtaining a code from a development branch during project development, and creating a personal development branch; performing a local integration test on the developed personal development branches; if the local integration test is passed, merging the codes of the personal development branches into the development branches, and performing a system integration test on the development branches; if the system integration test is passed, obtaining the code from the development branch, creating arelease branch, and performing a user acceptance test on the release branch; if the user passes the acceptance test, combining the code of the release branch to the main branch, and putting the code of the main branch into production for use. According to the invention, the personal development branch is allowed to be created, a plurality of developers can be supported to perform project development at the same time, codes of the developers can be merged into the development branch in time, the timeliness of code merging is improved, the code branch can be detected in time, and the efficiencyof code detection is improved.

Description

technical field [0001] The invention relates to the field of computer technology, in particular to a code branch management method and device. Background technique [0002] At present, there are three mainstream code branch management methods, namely, trunk-based development (TBD), Git flow, and GitHub flow. Among them, the main development branch is suitable for agile small-scale teamwork, and maintains the robustness of the main code through frequent merging; the Git flow is relatively complex, and has high requirements for the management of feature branches. If the code is not submitted and merged according to the agreed rules, it is very easy to happen Code conflicts; GitHub flow requires a strong sense of agility, similar to backbone development, emphasizing frequent submissions and frequent merging, and is more suitable for professional groups such as open source communities. [0003] The branch management method of the trunk development code is briefly described as f...

AI Technical Summary

Problems solved by technology

[0005] But in the actual development work, the code management of single trunk development is not a big problem when the project is newly established, but if the project enters the maintenance period, it is easy to cause the following problems: In the continuous development of the version, there is a time gap between project development and code testing. As a result, the code cannot be detected in time, which will lead to the problem that a stable and commercially available version cannot be released quickly

Gitflow has the following shortcomings of difficulty in merging after version development: GitFlow attaches great importance to management and emphasizes multi-branch development, which will cause integration lag, difficulty in merging, and affect continuous integration

[0010] But in the case of adhering to the practice of continuous integration, the feature branch has the following problems: continuous integration encourages more frequent code integration and interaction, and the sooner the conflict is resolved, the better, while the code isolation strategy of the feature branch delays the code as much as possible integration of

However, the backbone development has the problem that code detection is difficult to carry out in a timely manner, Git flow has the problem that code branches are difficult to merge during project development, and GitHub flow has the problem of limited number of developers

In the case of large enterprises gradually increasing the requirements for code management intensity, there is no code management method that can solve the above problems well

Images