Well, then just use git svn to update the master of his fork to match the official PHP svn. It'll just be a fast forward anyway.

Two birds with one stone.