Github user markhamstra commented on the pull request:
https://github.com/apache/spark/pull/407#issuecomment-40911136
Right, that's essentially how to do it: A forced push from a local checkout
that is in the correct state. So, if you originally made the PR from a branch
called `PRbranch` and subsequently pushed a commit from that branch that you
shouldn't have, then one fix procedure would be to do the following starting
from your up-to-date checkout of `PRbranch`:
git checkout -b Keeper
git checkout PRbranch
git reset --hard `SHA of the last commit that is supposed to be in the PR`
git push origin +PRbranch
After that, your local checkout, github repo, and the PR should all agree
that `PRbranch` contains only the correct commits; and the new `Keeper` branch
in your local repo has everything that is in `PRBranch` plus the extra commits.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
