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:

  • Chef git cookbook: how to fix permission denied while cloning private repo?
  • Change the username for Git in Xcode?
  • How to detach the local git repository from its working directory?
  • Github pull request without old commits
  • Can git retain file owner, permissions, ACLs, and file attributes on a local Windows NTFS machine?
  • Git unable to push after changeing privileges
    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!

  • Detached head in git
  • How to complete a git clone for a big project on an unstable connection?
  • How to run cloned Django project?
  • Git - master change, rebase onto complex branches?
  • Is there a 'git sed' or equivalent?
  • OSX Yosemite - invalid characters in path
  • 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.