如何与远程 Git 存储库同步？

我在 github 上分了个项目，做了些改动，目前为止还不错。

与此同时，我分支的存储库发生了变化，我希望将这些变化放到我的存储库中。我该怎么做？

316574 次浏览

小开

Assuming their updates are on master, and you are on the branch you want to merge the changes into.

git remote add origin https://github.com/<github-username>/<repo-name>.git
git pull origin master

Also note that you will then want to push the merge back to your copy of the repository:

git push origin master

小开

最佳答案

Generally git pull is enough, but I'm not sure what layout you have chosen (or has github chosen for you).

小开

You need to add the original repository (the one that you forked) as a remote.

git remote add github (clone url for the orignal repository)

Then you need to bring in the changes to your local repository

git fetch github

Now you will have all the branches of the original repository in your local one. For example, the master branch will be github/master. With these branches you can do what you will. Merge them into your branches etc

小开

You have to add the original repo as an upstream.

It is all well described here: https://help.github.com/articles/fork-a-repo

git remote add upstream https://github.com/octocat/Spoon-Knife.git
git fetch upstream
git merge upstream/master
git push origin master

小开

On github UI, switch to the branch you want to update with new changes from fork. Then simply select:

fetch upstream