git远程分支未显示,因此我无法合并. (2) [英] A git remote branch is not showing, so I cannot merge. (2)
问题描述
一个git远程分支未显示,因此我无法合并. (2)
上一个问题的链接在这里,但是您无需阅读上一个问题就可以理解该问题.
Git远程分支未显示,因此我无法合并
A git remote branch is not showing, so I cannot merge. (2)
The link for the previous question is here, but you do not need to read the previous question in order to understand this question.
Git remote branch not showing, so I cannot merge
我希望与"master/ashimaSharma"合并并遇到问题.
网络图如下所示,请参阅2017年8月和9月部分:
https://github.com/liuduan/CAT-APP-PROJECT/network
我希望与"master/ashimaSharma" 合并,但看不到分支.
我做了获取-全部" 和获取远程-v" ,
I hope to merge with "master/ashimaSharma" and having problem.
The network graph looks like this, please see the 2017-Aug and -Sept part:
https://github.com/liuduan/CAT-APP-PROJECT/network
I hope to merge with "master/ashimaSharma" but I cannot see the branch.
I did "get fetch –-all", and "get remote -v",
>> git remote -v
SS-Master https://github.com/sumit0704/CAT-APP-PROJECT/ (fetch)
SS-Master https://github.com/sumit0704/CAT-APP-PROJECT/ (push)
origin https://github.com/liuduan/CAT-APP-PROJECT (fetch)
origin https://github.com/liuduan/CAT-APP-PROJECT (push)
我应该怎么做才能与船长/ashimaSharma" 合并?
What should I do to see and merge with "master/ashimaSharma"?
推荐答案
远程分支不会显示在分支的存储库中完成的任何工作.在您的情况下,远程分支是Department_Head
,HEAD_2
,President
和master
.如果您确实要合并"ashima1491"的更改,请要求他向您发送请求请求.
Remote branch won't show any work done in the forked repositories. In your case the remote branches are Department_Head
, HEAD_2
, President
and master
. If you really want to merge "ashima1491"'s changes, ask him to send you a pull request.
或者-
您还可以使用
添加另一个远程"(另一个github存储库)
git remote add origin1 https://github.com/ashima1491/CAT-APP-PROJECT.git
这将添加另一个名为"origin1"的遥控器,该遥控器指向ashima1491的
github存储库.接下来,您可以使用-
将她的代码拉到存储库中
git pull origin1 master
鉴于您当前在您的master
分支,这会将她的master
分支拉"到您的master
.然后,您可以添加,提交和推送.
Alternatively -
You can also add another "remote" (the other github repository) by using
git remote add origin1 https://github.com/ashima1491/CAT-APP-PROJECT.git
This will add another remote named "origin1" which points to ashima1491's
github repository. Next you can pull her code to your repository using -
git pull origin1 master
given you are currently at your master
branch this will "pull" her master
branch to your master
. You can then add, commit and push.
这篇关于git远程分支未显示,因此我无法合并. (2)的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!