Github user felixcheung commented on the issue:
https://github.com/apache/zeppelin/pull/1582
I think if you are doing a rebase it might be easier to use a tool. Have
you tried SourceTree or GitHub Desktop tool?
---
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.
---
