Forking a repository that got updated in GitHub

Question

What is the best way to get an updated repository? There is usually a button that says "Fork" but a "Your Fork" button takes its place. Is this because I have already forked an older version of the repository?

Answer 1

You can update your repository via command

git fetch

Then look around and do merge/rebase if necessary.

Answer 2

You should add the original repository as a source to your local git repository

cd /my/local/repository
git remote add upstream [email protected]/author/originalrepo.git

You can chose whatever name you want, but I usually stick with upstream.

With git pull upstream master you can grab the master branch from the original repo, merge in the changes and with git push origin master push it up to your fork