Github user srowen commented on the pull request:
https://github.com/apache/spark/pull/942#issuecomment-44955394
(Yeah you don't normally want merge commits in a PR. If you need to sync
with master, you `git rebase upstream master` and `git push --force`. Here you
can fix it up with `git rebase -i HEAD~3` and mark 2 of the 3 commits as
"squash", then edit the commit message, and `git push --force`. That said, the
end result change here looks like exactly what you intended anyway.)
---
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.
---
