git_ask_02-How to synchronize to the base master after fork

ID = git_ask_02

Question

How to synchronize to the base master(the server you forked from) after fork?

Answer

Follow the following precedure to make it,

Step1: Check remote server

$ git remote -v
origin  git@github.com:Shane-pe/hello-world.git (fetch)
origin  git@github.com:Shane-pe/hello-world.git (push)

Step2: Add new server and check again

$ git remote add upgrade git@github.com:ShaneRun/hello-world.git

$ git remote -v
origin  git@github.com:Shane-pe/hello-world.git (fetch)
origin  git@github.com:Shane-pe/hello-world.git (push)
upgrade git@github.com:ShaneRun/hello-world.git (fetch)
upgrade git@github.com:ShaneRun/hello-world.git (push)

Step3: Fetch

$ git fetch upgrade
From github.com:ShaneRun/hello-world
 * [new branch]      master     -> upgrade/master

Step4: Cut branch ‘dev’

Notes: This is more safe operation, because it will not influence your working tree during merge.

$ git checkout -b dev
Switched to a new branch 'dev'

Step5: Merge to branch ‘dev’

$ git merge upgrade/master
Updating 0a9afec..b3bb50c
...

Step6: Switch to branch ‘master’

$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.

Step7: Merge branch ‘master’ with branch ‘dev’

$ git merge dev
Updating 0a9afec..b3bb50c
...

Step8: Push to origin master

$ git push origin master
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
To github.com:Shane-pe/hello-world.git
   0a9afec..b3bb50c  master -> master

Reference

[1] 在github上fork项目如何同步并解决冲突