简体   繁体   English

我们可以从发布分支创建功能分支吗

[英]Can we create feature branch from release branch

I am practising git these days.这些天我在练习 git。 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 master 分支作为生产分支
  2. create a staging branch from master从 master 创建一个暂存分支
  3. and then create a develop branch from staging branch然后从暂存分支创建一个开发分支
  4. and also practice creating all feature branches from staging branch并练习从staging分支创建所有功能分支
  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.在发布时,将功能分支合并到staging分支,然后将staging分支合并到master分支。

在此处输入图像描述

  1. After release, delete the feature branch.发布后,删除功能分支。
  2. And rebase other feature branches with staging branch.并使用staging分支重新设置其他功能分支。

在此处输入图像描述

暂无
暂无

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

相关问题 如何在功能分支上创建发布 - How to create release on feature branch 我们可以在 Gitlab 中创建具有相同功能分支的不同合并请求吗? - Can we create different Merge requests with same feature branch in Gitlab? Github-在桌面上的发布分支上创建功能分支? - Github - create feature branch off a release branch on desktop? 如果你从标签创建一个 git 功能分支而不是发布分支会发生什么? - What happens if you create a git feature branch instead of release branch from a tag? 在gitflow中,如果我们有一个发布分支开放了一个星期,我们仍然可以将功能分支合并到开发中吗 - In gitflow if we have a release branch open for one week can we still merge feature branches into develop 在合并我的拉取请求之前,我可以将更新从发布分支拉到我的功能分支吗? - Before merging my pull request can I pull update from release Branch to my feature branch? Git工作流程 - 从发布分支恢复功能分支 - Git workflow - Reverting a feature branch from release branch “从主分支创建功能分支”与“从发布分支创建功能分支”之间的区别 - Difference between "creating the Feature branch from master" and difference between "creating feature branch from Release Branch" 如果目标分支后面有一些提交,我们如何限制git不允许功能分支合并 - How can we restrict git to not allow merge from the feature branch if it is some commits behind the destination branch 从另一个功能分支创建Git功能分支 - Create Git feature branch from another feature branch
 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM