Git merge from someone else's fork

I have a repository on github, and someone else has forked it and made changes.

I want to:

  1. Create a new branch
  2. Merge their changes into my branch

I have created the new branch:

git commit -b my_new_branch

How do I merge their code into this new branch?

This is the branch that I have created:

This is the branch that I want to merge:

What is the best way to do this? I’ve tried a “pull” and it won’t work. I honestly have no idea what I’m doing in gitland, so if there is a better way to accomplish this (besides my creating a branch and trying to merge) then I am all ears!

  • Untrack Files From Git LFS To Allow Me To Push to GitHub Server
  • using Yalantis/Koloda library to load more than just 1 UIView
  • How to push Android Project to existing private empty repository in github with Android Studio?
  • What exactly does GitHub's “create a new project” menu item “Git ignore” do?
  • Failed to push some refs to GitHub
  • How can I add “current streak” of contributions from github to my blog?
  • How to modify Github pull request?
  • Username of comitter is not clickable on github website
  • One Solution collect form web for “Git merge from someone else's fork”

    Add their github fork repo as a remote to a clone of your own repo:

    git remote add other-guys-repo <url to other guys repo>

    Get their changes:

    git fetch other-guys-repo

    Checkout the branch where you want to merge:

    git checkout my_new_branch

    Merge their changes in (assuming they did their work on the master branch):

    git merge other-guys-repo/master

    Resolve conflicts, commit the resolutions and voila.

    Git Baby is a git and github fan, let's start git clone.