Github user jkbradley commented on the pull request:
https://github.com/apache/spark/pull/5596#issuecomment-97517089
@yinxusen The easiest way to fix merge issues is to update your master
branch and then use "git rebase master" (and fix whatever conflicts come up)
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
