Github user ehsanmok commented on the pull request:
https://github.com/apache/spark/pull/8729#issuecomment-151580148
@yu-iskw The problem I keet having is my master was polluted with unwanted
commits and so I reset hard and pulled from upstream/master and pushed master
updates as "update master", then I checked out on JIRA-10266 branch and reset
that as well and pulled updates from master and resolved conflicts and pushed
as the last commit. Where do you think I am doing it wrong? I don't want to
have master updates here! is that possible?
---
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]
