如何更新或同步 GitHub 上的分叉存储库? [英] How do I update or sync a forked repository on GitHub?

问题描述

我分叉了一个项目，应用了几个修复程序并创建了一个被接受的拉取请求.几天后，另一位贡献者进行了另一项更改.所以我的叉子不包含那个变化.

I forked a project, applied several fixes and created a pull request which was accepted. A few days later, another change was made by another contributor. So my fork doesn't contain that change.

我怎样才能把那个零钱放到我的叉子里?当我有进一步的更改要贡献时，是否需要删除并重新创建我的分叉?或者有更新按钮吗?

How can I get that change into my fork? Do I need to delete and re-create my fork when I have further changes to contribute? Or is there an update button?

推荐答案

在分叉存储库的本地克隆中，您可以将原始 GitHub 存储库添加为远程".(Remotes"就像存储库 URL 的昵称——例如，origin 就是其中之一.)然后您可以从上游存储库中获取所有分支，并重新设定您的工作以继续处理上游版本.就可能看起来像的命令而言:

In your local clone of your forked repository, you can add the original GitHub repository as a "remote". ("Remotes" are like nicknames for the URLs of repositories - origin is one, for example.) Then you can fetch all the branches from that upstream repository, and rebase your work to continue working on the upstream version. In terms of commands that might look like:

# Add the remote, call it "upstream":

git remote add upstream https://github.com/whoever/whatever.git

# Fetch all the branches of that remote into remote-tracking branches

git fetch upstream

# Make sure that you're on your master branch:

git checkout master

# Rewrite your master branch so that any commits of yours that
# aren't already in upstream/master are replayed on top of that
# other branch:

git rebase upstream/master

如果您不想重写 master 分支的历史记录(例如因为其他人可能已经克隆了它)，那么您应该将最后一个命令替换为 git merge upstream/master.但是，为了进一步发出尽可能干净的拉取请求，最好重新设置基础.

If you don't want to rewrite the history of your master branch, (for example because other people may have cloned it) then you should replace the last command with git merge upstream/master. However, for making further pull requests that are as clean as possible, it's probably better to rebase.

如果您已将分支重新定位到 upstream/master，您可能需要强制推送以便将其推送到您自己在 GitHub 上的分叉存储库.你可以这样做:

If you've rebased your branch onto upstream/master you may need to force the push in order to push it to your own forked repository on GitHub. You'd do that with:

git push -f origin master

您只需在重新定位后第一次使用 -f.

You only need to use the -f the first time after you've rebased.

这篇关于如何更新或同步 GitHub 上的分叉存储库?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！