Github user vanzin commented on the pull request:
https://github.com/apache/spark/pull/1094#issuecomment-47250080
Generally we ask for the PR submitter to resolve conflicts. You just have
to rebase your branch on top of master, resolve conflicts, and force push it
into your repo, the PR will be updated automatically.
---
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.
---
