search

Home  >  Q&A  >  body text

Version Control - How to use gitflow for versatile parallel development?

Our current project is relatively complex, with several Features in progress at the same time. Assume that F1 and F2 are merged into Develop at the same time. Will this generate many Release branches? If there is only one Release branch, both of them include Modifications of F1 and F2 have been made. Suppose that after the developers of F2 have tested the functions of F2 and feel that there is no problem, they publish it to the Master. This does not mean that F1 Are the functions confused....

我想大声告诉你我想大声告诉你2793 days ago776

reply all(2)I'll reply

  • 漂亮男人

    漂亮男人2017-05-02 09:41:47

    1. After the completed functions are merged into develop for testing feature => develop

    2. Testing completed, merge feature => master

    3. Release, merge master=> release

    4. Hot patch, cut a hotfix branch from master, repair is completed, merge hotfix => develop for testing; test is completed, merge hotfix => master hotfix => release

    reply
    0
  • 巴扎黑

    巴扎黑2017-05-02 09:41:47

    1. F1, F2 merged into develop has nothing to do with how many releases are generated. There will only be one release branch

    2. The release branch is based on develop, which means that F1 and F2 must be included during testing

    3. After the release branch is completed, it is merged into master, which means that F1 and F2 must enter master

    4. If you want to only test F2 and release F2 this time, then don’t merge F1 into develop

    reply
    0
  • Cancelreply