简体   繁体   English

Git合并多个带有斜杠的名称

[英]Git merging multiple branches with slashes in name

I'm trying to merge multiple branches I've created into one single branch. 我正在尝试将创建的多个分支合并到一个分支中。 The branches are named like so: desktop/stack, desktop/account etc... 分支的命名如下:桌面/堆栈,桌面/帐户等...

I want to merge them into desktop/master, however it says it is already up to date. 我想将它们合并到桌面/母版中,但是它说它已经是最新的了。 Is it because they all share the desktop name? 是因为它们都共享桌面名称吗? If that's the case, are any of the branches truly separated? 如果是这种情况,那么是否有任何分支真正分开了?

If they are all merged, and the same branch anyways, whats the point of separating the names? 如果它们全部合并在一起,并且仍然是同一个分支,那么分离名称又有什么意义呢?

EDIT: 编辑:

I'm just using terminal and checked out a new branch called desktop/master, then used git merge desktop/account. 我只是使用终端并签出了一个名为Desktop / master的新分支,然后使用git merge桌面/帐户。 I get the Already Up To Date message. 我收到“已经更新”消息。

I see only two possibilities here: 我在这里只看到两种可能性:

1) The desktop/master branch really is up to date, and merging it with desktop/account would bring in no new changes, or 1) desktop/master分支确实是最新的,将其与desktop/account合并不会带来任何新变化,或者

2) You need to update the desktop/account branch before you try to merge it into desktop/master . 2)您需要先更新desktop/account分支, 然后再尝试将其合并到desktop/master If this be the case, then the following should do the trick: 如果是这种情况,则应采用以下方法:

git pull origin desktop/account
git checkout master
git merge desktop/account

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM