[英]Git - What happens to my local master branch after a pull request? How do I manage multiple in progress branches?
I originally was wondering what I do with branches that get accepted after a pull request, but I found this: Changing branches and delete branch in Git after successful pull request 我最初想知道如何处理在请求请求后被接受的分支,但是我发现了这一点: 成功请求请求后,在Git中更改分支并删除分支
Now I am wondering what happens if I am working on a project with my master sync'd to the original master but have five local branches created to implement different features. 现在,我想知道如果我正在与我的主对象同步到原始主对象但创建了五个本地分支来实现不同功能的项目,会发生什么情况。 If these features are complete on my end but have not been accepted pull requests, what is the best way to create a local version with some/all of these branches included for compilation?
如果这些功能在我看来是完整的,但是尚未被接受,则创建与某些/所有这些分支一起包含在内的本地版本的最佳方法是什么?
Would I create another branch and merge the master plus all/some these branches into it for my own testing depending on which branches I want to include for each test? 我是否会创建另一个分支,然后将母版加上所有/某些这些分支合并到其中以进行自己的测试,具体取决于我希望为每个测试包括哪些分支?
Yep, sounds like you're essentially wanting your own local integration branch(es). 是的,听起来您本质上是想要您自己的本地集成分支。 In that case, you would do just what you said;
在这种情况下,您将按照您所说的去做。 branch off the main line (or one of your feature branches if you want that as a starting point) and merge in the pieces you want.
从主线分支(如果需要,则分支一个功能分支),然后合并成所需的片段。
That way you keep a pristine main line, but can still test your various features together. 这样,您可以保持原始主线,但仍可以一起测试各种功能。
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.