6. Merge a Pull Request

Follow the Github command line instructions to checkout the pull request branch as a separate remote branch

Execute git rebase to rebase this branch to the latest master - you'll probably have to git mergetool a lot, since the branch will have no knowledge of master's commits

git push and git svn dcommit as usual

Unable to extract revision information from commit

If you get this during a git svn dcommit, then you've probably messed up the merge somewhere - you need togit rebase before you merge changes between branches.

git svn rebase: Unknown option: strategy-option

Good luck. I think this is a bug.

ignore-paths not matching files

It turns out the regexp accepted by --ignore-paths is not a complete regexp; it needs an anchor (^ or $) in order to match. So instead of doing something like --ignore-paths=".+custom.css", you need to do --ignore-paths="custom.css$".