Github user srowen commented on the pull request:
https://github.com/apache/spark/pull/1115#issuecomment-46755115
Assuming you have the `apache/spark` repository configured in your git
repository as `upstream`, you can checkout your branch for this PR and `git
pull --rebase upstream master`. This will try to apply your commits onto the
latest code. You may have to resolve merge conflicts. Then `git push` your
branch to update this PR.
If it's getting confusing, you can start over. Update your copy of
`master`, make a new branch, and `apply` or `cherry-pick` your 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.
---
