我在github上有一个来自项目( upstream )的分支( origin )。现在上游项目添加了一个新分支,我想导入到我的分支中。我如何做到这一点?
我试着检查远程并在其上创建了一个分支,但是它以 git push 试图推送到上游:
git checkout upstream / branch git checkout -b branch编辑 h3>
也许这并不明确,但我想将分支添加到我的本地存储库,以便我可以将它推送到 origin (我的叉)通过 git push 。因为上游软件仓库通常是只读的,所以你可以派它分发。
所以我基本上希望签出一个不存在的< origin ,其内容将被从上游。
解决方案
确保您已将上游分支拉入您的本地回购:
- 首先,确保您的工作树是干净的(提交/隐藏/恢复任何更改)
- 然后, git fetch upstream 检索新的上游分支
创建并切换到新的上游分支的本地版本( newbranch ):
- git checkout -b newbranch upstream / newbranch
当您准备将新分支推送到来源时:
$ b
-u 开关设置对指定远程的跟踪(在本例中, origin )
I have a fork (origin) from a project (upstream) on github. Now the upstream project has added a new branch, I want to import into my fork. How do I do that?
I tried checking out the remote and creating a branch on top of that, but that configures the branch the way that git push is trying to push to the upstream:
git checkout upstream/branch git checkout -b branchedit
Maybe that wasn't clear, but I want to add the branch to my local repository, so I can push it to origin (my fork) via git push. Because upstream repositories are usually read-only and you fork it to contribute.
So I basically want to checkout a non-existent branch on origin whose contents will be pulled in from upstream.
解决方案Make sure you've pulled the new upstream branch into your local repo:
- First, ensure your working tree is clean (commit/stash/revert any changes)
- Then, git fetch upstream to retrieve the new upstream branch
Create and switch to a local version of the new upstream branch (newbranch):
- git checkout -b newbranch upstream/newbranch
When you're ready to push the new branch to origin:
- git push -u origin newbranch
The -u switch sets up tracking to the specified remote (in this example, origin)
更多推荐
Github:将上游分支导入分叉
发布评论