Github-合并提交对多个分支的拉取请求 [英] Github - merging commits pull requests to several branches

问题描述

在将代码推送到我们的3个主要分支-dev，releaseCandidtae和production时，我们添加了强制提取请求流程.

We added a flow of mandatory pull requests when pushing code to our 3 main branches - dev, releaseCandidtae and production.

流程为:开发->功能分支->拉取请求并合并回开发合并\樱桃选择以释放Candiadte分支合并\樱桃选择到生产分支有时，功能分支是一个修复程序，从生产分支中取出，然后将樱桃重新选回到开发人员中.

the flow is: dev -> feature-branch -> pull request and merge back to dev merge\cherry pick to releaseCandiadte branch merge\cherry pick to production branch Sometimes the feature branch is a fix and go out from production branch and cherry picked back to dev.

我知道代码库可能有所不同，但是有没有一种方法可以通过一个拉取请求将提交合并到所有分支中?也许有更好的方法来建立该流程的分支层次结构?目前都从master分支出去了.谢谢

I understand that the code base might be different but is there a way to merge a commit to a all branches with one pull request? Maybe there a better way to build the branches hierarchy for that process? currently all went out from master branch. Thanks

推荐答案

您所描述的流程对我来说有点不寻常，我不确定您打算在哪种情况下合并到所有分支.更为常见的流程 git-flow 的概念某些服务支持的级联合并".

The flow you describe sounds a bit unusual to me and I'm not sure in what cases you plan to merge to all branches. The more common flow, git-flow, allows the concept of a "cascading merge," which is supported by some services.

Bitbucket支持自动级联合并，您可以在此处阅读. https://confluence.atlassian.com/bitbucketserver/automatic-branch-merging-776639993.html

Bitbucket, for example, supports automatic cascade merges, as you can read about here. https://confluence.atlassian.com/bitbucketserver/automatic-branch-merging-776639993.html

据我所知，GitHub不支持它.很有可能是因为它不是 GitHub-flow 的有用功能.

As far as I know, GitHub does not support it. Most likely because it's not a useful feature for GitHub-flow.

这个问题和答案是相关的. Github级联合并的做法是什么?

This question and answer is related. What's the practice for Github cascading merge?

这篇关于Github-合并提交对多个分支的拉取请求的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！