简体繁体 English

使用Git-Flow，完成的功能会集成到另一个功能分支吗？

[英]Using Git-Flow, Will a finished feature be integrated to another feature branch?

原文 2016-01-25 04:49:50 4 1 git/ github/ git-flow/ git-tower

After using Git-Flow for a couple of months, I have a question maybe someone could help with... 在使用Git-Flow几个月后，我有一个问题，也许有人可以帮助您...

Say there are 2 feature branches checked out locally and have been pushed to the GitHub repo but not finished. 假设有2个功能分支在本地检出，并已推送到GitHub存储库，但尚未完成。 One of them is the setup of a data scheme for the application and the other is working on a single screen of the application. 其中之一是为应用程序设置数据方案，而另一项则是在应用程序的单个屏幕上工作。 Up until now the screen feature has not had to use the data scheme, but now that is about to change. 到现在为止，屏幕功能还没有使用数据方案，但是现在情况即将改变。 So... 所以...

If I finish (and therefore merge) the data-scheme-feature into the develop branch, will this code (and functionality) added to the develop branch be visible in the screen-feature. 如果我将数据方案功能完成（并合并）到develop分支中，那么添加到develop分支中的此代码（和功能）将在屏幕功能中可见。

Will I need to re-pull the screen branch? 我需要重新拉动屏幕分支吗？ Will I have to finish the screen branch and then start a new feature in order to be able to use the newly added data-scheme? 为了能够使用新添加的数据方案，我是否必须完成屏幕分支，然后启动新功能？

1 个解决方案

Will I need to re-pull the screen branch? 我需要重新拉动屏幕分支吗？

You could simply merge develop into the still-in-progress screen-feature branch. 您可以简单地将develop合并到仍在进行中的screen-feature分支中。 And go on in that branch, with everything available. 然后继续使用该分支，并提供所有可用功能。