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:

  • What does “1 line adds whitespace errors” mean when applying a patch?
  • Git clone verbose mode – show each incoming object
  • How can I manually remove a blob object from a tree in Git?
  • Ansible task - clone private git without SSH forwarding
  • Make changes to a git submodule and then add those into my main project
  • can't push a new repo
    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!

  • How to create a tag on GitHub when a PR is merged?
  • Set username and email for msysgit portable
  • Bitbucket - push repo with git lfs
  • ReinH Git Workflow
  • Add all files to a commit except a single file?
  • Where can I download the latest gitx app (dmg) from gitx branch
  • 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.