我们可以合并到主分支但从一个更新的分支“A”并忽略合并到 A 的其他分支吗？
[英]Can we merge into the master branch but from one updated branch "A" and ignore other branches that were merged into A?
问题描述
From our master branch we created a new branch "1.5.5".
从我们的主分支中，我们创建了一个新分支“1.5.5”。 From this 1.5.5 branch we created another branch "1.5.6".从这个 1.5.5 分支，我们创建了另一个分支“1.5.6”。 Different groups of developers are working on each of these branches.不同的开发人员小组正在开发这些分支中的每一个。 When we finished with 1.5.5, we merged it into 1.5.6.当我们完成 1.5.5 后，我们将其合并到 1.5.6 中。
Now we need to update the master branch.现在我们需要更新主分支。 Would it be sufficient to just merge 1.5.6 into master?将 1.5.6 合并到 master 就足够了吗？ We don't need to merge 1.5.5 into master, correct?我们不需要将 1.5.5 合并到 master 中，对吗？
2 个解决方案
解决方案1
4 已采纳 2021-05-25 17:32:49
The commits made to the 1.5.5 branch are in the 1.5.6 branch after the 1.5.5 branch were merged to the 1.5.6 branch. 1.5.5分支合并到1.5.6分支后，对1.5.5分支的提交在1.5.6分支中。
When you merge the 1.5.6 branch to the master branch then all commits in the 1.5.6 branch will be merged into master regardless of which branch those commits were originally made to.当您将1.5.6分支合并到master分支时， 1.5.6分支中的所有提交都将合并到master中，无论这些提交最初是在哪个分支中进行的。
解决方案2
2 2021-05-25 17:34:22
Correct, it's enough to merge 1.5.6 into master, because 1.5.6 has been merged with 1.5.5 too.没错，将 1.5.6 合并到 master 就足够了，因为 1.5.6 也已与 1.5.5 合并。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.