简体   繁体   中英

Can we create feature branch from release branch

I am practising git these days. I have a query regarding best pratice on creating feature branches. In my project, creating release branches first from develop branch and then creating feature branches from these release branch.

But when I searched in google, I found that feature branches getting branched off from develop branch and then while release time these feature branches gets merged again into develop, and then release branch gets branched off from develop branch.

May I know are we going to face any issues with the approach following in our project, please clear me.

For the branching structure, preferable branching structure is to create a

  1. master branch as a production branch
  2. create a staging branch from master
  3. and then create a develop branch from staging branch
  4. and also practice creating all feature branches from staging branch
  5. And to test all features together in the development environment merge feature branchs to develop branch

在此处输入图像描述

  1. At the time of release, merge feature branch to staging branch and then staging branch to master branch.

在此处输入图像描述

  1. After release, delete the feature branch.
  2. And rebase other feature branches with staging branch.

在此处输入图像描述

The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM