1.clone fock的项目到本地
git clone /YOUR_USERNAME/YOUR_FORK.git
2.查看项目远程状态
git remote -v# origin /YOUR_USERNAME/YOUR_FORK.git (fetch)# origin /YOUR_USERNAME/YOUR_FORK.git (push)
3.添加一个将被同步给 fork 远程的上游仓库
git remote add upstream /ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git
4.再次查看状态确认是否配置成功
git remote -v# origin /YOUR_USERNAME/YOUR_FORK.git (fetch)# origin /YOUR_USERNAME/YOUR_FORK.git (push)# upstream /ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (fetch)# upstream /ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (push)
5.从上游仓库 fetch 分支和提交点，传送到本地，并会被存储在一个本地分支 upstream/master
git fetch upstream# remote: Counting objects: 75, done.# remote: Compressing objects: 100% (53/53), done.# remote: Total 62 (delta 27), reused 44 (delta 9)# Unpacking objects: 100% (62/62), done.# From /ORIGINAL_OWNER/ORIGINAL_REPOSITORY# * [new branch]master-> upstream/master
6.切换到本地主分支(如果不在的话)
git checkout master# Switched to branch 'master'
7.把 upstream/master 分支合并到本地 master 上
git merge upstream/master# Updating a422352..5fdff0f# Fast-forward# README| 9 -------# README.md | 7 ++++++# 2 files changed, 7 insertions(+), 9 deletions(-)# delete mode 100644 README# create mode 100644 README.md
8.更新到 GitHub 的 fork 上
git push origin master
原文链接：https://gaohaoyang.github.io//04/12/Syncing-a-fork/
