Github user chazchandler commented on the pull request:
https://github.com/apache/spark/pull/1269#issuecomment-66311502
@akopich , rebasing can be tricky, especially if you've been off on a
branch for a while. `git reflog` can be helpful in getting back to previous
states if you end up not being able to solve the issue. however you'll
probably need to solve the issue to get things merged in anyway. my guess is
that something about `org.apache.spark.ui.jobs` may have changed; one option
might be to rebase on branch-1.1 or -1.2 as a first step to limit the
possibility of an unstable master affecting your code integration.
---
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
