Git fork no longer automatically merges

Question

I have a repo (hosted on Github).

There is a fork of my repo. That fork is sometimes updated.

Upon a pull request from their repo to mine, GitHub no longer offers an automatic merge - it seems to me that the two repos have divereged in history.

Am I missing something? The forker has told me that they have pull my most recent changes before performing a pull request.

Answer 1

If you have pushed your most recent changes to github, and the forker has fetched and merged them, and pushed the result back, an automatic merge should be possible. I strongly suspect that one of you left one of these steps out.

You can simply pull the changes in and merge them yourself with:

git pull git://github.com/forker/project.git