Github user wangmiao1981 commented on the pull request:
https://github.com/apache/spark/pull/12406#issuecomment-212752658
@xwu0226 use git rebase upstream/master. Do not use git merge
upstream/master. I have the same issue before. git merge will add others'
commits to your PR. git rebase will discard others' 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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
