Github user marmbrus commented on the pull request:
https://github.com/apache/spark/pull/1151#issuecomment-47573444
You'll need to merge with master and resolve the conflicts. Something like:
```
git remote update
git merge origin/master
git add <fixed files>
git commit
```
---
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.
---
