How do I merge changes of a git fork into master of my repo?

Question

I have a repository on Github and someone has forked it and made changes (that have helped improve the repository). Is there a git command that will allow me to take those changes made by the other user and modify my original master repo to match that forked repository?

Answer 1

option 1: Use GitHub's Pull Request mechanism

Pull Requests were designed especially for this purpose: making it easier for beginners and non-git experts to accept contributions from forks.

See also:

• Configuring pull request merges
• How to accept a GitHub Pull Request

option 2: setup the forked repo as a remote

The other option is to setup the fork as an additional remote and fetch/pull from it. But that is more advanced and you sound like a beginner.