Merge Pull Request Considered Harmful
Hm... this seems like a very complicated way of saying that github should have a way to merge pull requests into a new branch.<p>...but it doesn't so you have to:<p><pre><code>    - checkout a local copy
    - add a remote to the PR
    - checkout a new branch
    - merge the PR into your local branch
    - fix code, merge to master
</code></pre>
Which is entirely true; it <i>is</i> annoying.<p>The simple solution, though, is to require pull requests to come in a feature branch, and flat out reject any that target master. <i>/shrug</i>