Github user corneadoug commented on the issue:
https://github.com/apache/zeppelin/pull/1024
@davidtzoor Thank you.
You might have the problem again considering you made your PR based on your
master branch.
Using a custom branch is usually safer, for example right now until this PR
is merged, you should not add any changes that differ from Apache Zeppelin
source code and is non-related to this PR.
If you do have to do a rebase again, try doing this while in your master:
* `git fetch zeppelinOriginalRepo`
* `git rebase zeppelinOrignalRepo/master`
* resolve conflicts
* `git push`or `git push -f`
---
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.
---
