将开发分支设置为拉取请求的默认值 [英] Set the develop branch as the default for a pull request

问题描述

我希望将pull请求从默认的功能分支合并到开发中。

我主张使用git flow，所以当一个pull请求被提交了一个功能，拉的请求需要合并到开发，而不是主人。

有些经理评论说，作为人类，有可能是团队负责人可能会忽略这一事实，并将错误的请求合并到主服务器中，从而导致后续版本的问题。

我们希望减轻合并地狱的风险，所以这个编程：我使用一个名为hubflow的gitflow分支（）的.com / gitflow /> http://datasift.github.com/gitflow/ ）。默认情况下，当创建一个功能分支 git hf feature start [tik-123] 时，功能分支会根据规格创建，但也会被推到原点。我们希望这可以用于协作。一旦功能完成，开发人员将转到github中的功能分支并发出pull请求。然后，团队负责人将审查拉取请求，并将该特性合并到开发中，如果该特性将在sprint中发布的话。 解决方案

或者让开发所有人在访问项目时看到的默认分支。缺点是任何克隆它的人默认都会得到一个不稳定的分支，但是默认情况下所有的pull请求都会转到develop分支。

I want to make the pull request merge into develop from the feature branch by default.

I'm advocating the use of git flow, so when a pull request is submitted for a feature, the pull request needs to get merged into develop, and not master.

Some of the managers commented that being human, there is a possibility that the team leads could overlook that fact and merge the pull request into master by mistake, causing issues with the release later on.

We want to mitigate the risks of merge hell so this would go a long way in achieving this goal.

Edit: I'm using a fork of gitflow called hubflow(http://datasift.github.com/gitflow/). By default, when a feature branch is created git hf feature start [tik-123] the feature branch is created per spec but also gets pushed up to origin. We want this for collaboration. Once the feature is complete, the dev will go to the feature branch in github and issue a pull request. The team leads will then review the pull request and merge the feature into dev if the feature is slated for release in the sprint.

解决方案

Alternatively make develop the default branch that everyone sees when visiting the project. The downside is that anyone who clones it will get an unstable branch by default but all pull requests will go to the develop branch by default too.

这篇关于将开发分支设置为拉取请求的默认值的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！