使用Xcode将当前分支合并到Master [英] Using Xcode to merge current branch into Master

问题描述

是否有使用Xcode将当前工作分支合并到master分支的快速方法?我不清楚'Merge'菜单选项到底在做什么(没有确切地标记清楚)，但是似乎正在将您选择的任何分支合并到当前分支中-我想这在您要测试时很有用您使用其他人提供的最新代码库进行更改.

Is there a quick way to merge the current working branch into the master branch using Xcode? I'm not clear on what the 'Merge' menu option is doing exactly (it's not exactly labelled clearly), but it seems like it is merging whichever branch you select into your current branch - I guess this is useful when you want to test your changes with the latest codebase from someone else.

完成一项功能后，我想将其合并到母版中，然后继续处理另一项功能.看来我必须切换到master分支，从那里合并，然后从master分支到另一个分支，然后在那个分支中处理功能#2.

When I finish a feature, I would like to merge it in to the master and then continue working on another feature. It seems like I have to switch to the master branch, merge from there, then make another branch from master and work on feature #2 in that one.

我正确吗?

推荐答案

是的，这是正确的. Git中的合并"操作需要另一个分支并将其合并到当前分支中.

Yes, that is correct. The "merge" operation in Git takes another branch and merges it into your current branch.

您正在描述的内容(为每个功能创建一个分支，然后将它们合并到母版中)通常称为功能分支"工作流，这是一种非常常见的工作流.

What you are describing (creating a branch for each feature, and merging them into master as you go) is generally referred to as the "feature branch" workflow, and it is a very common one.

这篇关于使用Xcode将当前分支合并到Master的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！