Git - 如何将远程分支合并到远程主服务器中 [英] Git - How to merge a remote branch into remote master

问题描述

因此，情况就是这样。

我创建了一个本地分支。然后我把那个本地分支推到github上。所以github现在有两个分支。

现在我想将两个分支合并到本地和github上。

这可能是一个愚蠢的问题，但不知何故，我没有在文档中看到它。

到目前为止我最好的猜测是本地合并，然后从github中删除远程分支？ 您创建了功能分支的合并在本地，将你合并到的分支（可能是主）推送到github。 Github现在将包含合并。然后删除您的本地和远程功能分支副本。

So here's the situation.

I created a local branch. Then I pushed that local branch to github. So github now has two branches.

Now I want to merge the two branches together both locally and on github.

This is probably a dumb question but somehow I'm not seeing it in the documentation.

So far my best guess is to merge locally, and then delete the remote branch from github?

解决方案

You create a merge of your feature branch locally, push the branch you merged to (probably "master") to github. Github will now contain the merge. Then delete your local and remote copy of the feature branch.

这篇关于Git - 如何将远程分支合并到远程主服务器中的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！