简体繁体 English

Git工作流功能分支需要另一个分支

[英]Git workflow feature branch needs another branch

原文 2014-12-17 17:53:19 6 1 git/ version-control/ branch

I have a master branch that needs two features added and both features need to be discussed via Pull Requests, but I have a problem I finished branch feature_1 and filled a Pull Request to the master branch. 我有一个master分支，需要添加两个功能，并且两个功能都需要通过Pull Requests进行讨论，但是我有一个问题，我完成了feature_1分支，并向master分支填写了Pull Request。 I need to start feature_2 and I noticed that it needs some of the changes I made in feature_1 . 我需要启动feature_2 ，我注意到它需要在feature_1进行的一些更改。 What is the normal way to tackle this situation within the Git workflow? 在Git工作流程中解决这种情况的正常方法是什么？ if it was my repository I would just merge the feature to master and create a new branch from there for the other feature. 如果这是我的存储库，则只需将功能合并到master，然后从那里为其他功能创建一个新分支。

1 个解决方案

So you need feature_1 + master ? 所以您需要feature_1 + master ？ Then simply branch feature_2 from feature_1 and not from master . 然后只需从feature_1而不是master分支feature_2 。

The normal way of handling such a situation is not having it in the first place: Either feature_1 and feature_2 are independent of each other, then they can be developed in parallel. 处理这种情况的通常方法不是一开始就将其置于首位： feature_1和feature_2彼此独立，然后可以并行开发它们。 Or there are dependencies, then they need to be developed one after the other. 或存在依赖关系，则需要一个接一个地开发它们。