Question

I have forked a repo on Github, another guy forked it too
I want to merge other-guy’s branch into my branch
How can I do it?

Answer 1

I suppose you have the following Github repositories:

• http://www.github.com/mainuser/mainrepo.git (the origin project)
• http://www.github.com/you/yourfork.git (your fork)
• http://www.github.com/other/anotherfork.git (another fork)

If you worked on your fork, you have a local clone clone of your own fork:

git clone [e-mail]:you/yourfork.git

In order to work with the origin project (and the other fork), you have to add the corresponding remotes:

git remote add upstream http://www.github.com/mainuser/mainrepo.git
git remote add fork http://www.github.com/other/anotherfork.git

With theses remotes, you can get the remote information by fetching:

git fetch upstream
git fetch fork

Finally, you can merge the work with yours:

git merge fork/branch_you_want_to_merge