Path to version management in parallel development (III)-Force version control and version merge

Source: Internet
Author: User

Common scenarios for force Version Control

1. It is about to be converted to production or listed, and developers do not want to be random.CodeInspection affects product quality and stability
2. It has already turned into a new product. We hope to control the modification of bugs, and do not want developers to randomly check the code that will affect the release of patches (packages ).

Method of version Force Control

1. Lock the branch to be protected (only the version administrator can modify it) and add the release label.
2. Let developers develop on the branch based on the release tag
3. register the code modification actions of the developer on the branch based on the release tag.
4. Release the version on the branch with the release tag for Integration Testing
5. Merge the code Modifications passed in the integration test to the protected branch by means of version merge.

As mentioned above, version merge also has the following common scenarios:

1. If a bug is modified, it needs to be merged into the baseline version so that a stable version can be released.

2. If the bug is modified, it needs to be merged into other codes that are developing new functions.

3. Changed the bug, resulting in a baseline change. We hope that the change will be reflected in the version 2.0 that has changed.

4. After the development of version 1.1 is complete, version 1.0 is no longer maintained and you want to merge version 1.1 into the baseline version as the basis for future development of the new version.

To be continued

 

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.