Github user yu-iskw commented on the pull request:
https://github.com/apache/spark/pull/8728#issuecomment-151962011
@ehsanmok according to the above warning message, we have any conflicts
with the master. So I'd like to explain how to resolve that. And I'd like to
review this PR after the first test pass.
When I have conflicts with the master after sending a PR, I always do the
following operations.
```
# now, you are on your branch. In this case, it's `SinceAnn`.
# where, `upstream` is the `apache/spark` repository.
# if you set the different name on your local computer, replace `upstream`
with the name..
git fetch upstream
git rebase upstream/master
# resolve the conflicts
# make sure to check coding style warnings before pushing it to github.
./dev/lint-scala
# push it to github
# where, `origin` is your github repository. In this case, It's
`ehsanmok/spark`.
git push -f origin SinceAnn
```
If you have any questions, please don't hesitate to ask.
---
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]
