How do I merge a parent fork?

Question

I forked a project on github, since then the original owner made changes to it. How do I pull down those changes and merge them into my fork?

Thanks!

Answer 1

First set up a remote for the upstream repository, if you haven't already:

git remote add upstream git://github.com/...

Then fetch the remote contents and merge from it (assuming you're on the corresponding master branch of your fork):

git fetch
git merge upstream/master