Development scenarios

Trunk oriented Development

For example, a four-member development team has two members in charge of one functional module, and the two functional modules are in the same project. At this time, if the four members are all developing on the main branch trunk, they must wait until the two functional modules are all ok before they can go online (the operation is relatively simple and will not be described again).

Disadvantages:

  • Too much development coupling
  • Project code is not easy to manage

Branch oriented Development

Create two branches according to the above logic, two people edit a branch, when the development of one branch can be directly published after the development of the other two people

Advantages:

  • Reduce coupling between team tasks
  • Code management is more convenient

SVN Usage Process

The flow chart

Steps,

The development process

  1. Branches or tag Operation on Trunk Branch name

    20180822_test_demoProject rule: time _ function module __ Project name

  2. Checkout the new branch locally

  3. Develop new features and do local testing (multiple commits)

  4. The local test is completed. Submit the code to the branches corresponding to SVN

  5. Carry out the code of branch release and test on the beta server

Preparing the release process (synchronizing the Trunk)

During development, the trunk may have been modified by other teams so you need to synchronize the trunk code

  1. Merge new code from Trunk into local branches merge new code from trunk into local branches
  2. Submit the added code to SVN Branches (a regression test on beta can be performed at this point)

Review code release

How to make the code review is a problem at this time Such as in step 3 repeated submit developers have don’t know the development of the new features of the submitted which code If rushed to release at this time there may be some unexpected situation Such as modified the configuration files There is no change back Lead to online a lot of problems, So how to review the code please see the following steps

  1. Merge the SVN trunk code to merge from SVN Branches In this case, it is equivalent to merge all the new or modified codes of the function module in branches into the local trunk
  2. Before committing, be sure to review each code file carefully to see if it is correct!! Do not omit, remember!

The original address

There are shortcomings also hope to give advice welcome attention

Please do not reprint without author’s permission, thank you 🙂