In the http://matplotlib.org/devel/gitwash/development_workflow.html should be a section for rebase a pull request, it is pretty common to be asked to do it.