Github user Leemoonsoo commented on the issue:
https://github.com/apache/zeppelin/pull/1688
If i assume your remote name for Zeppelin repository is `apache-github`
(you can check it by running `git remote -v`),
First, fetch Zeppelin repo (to get latest master) with `git fetch
apache-github`, and then rebase or merge the master branch to your branch `git
rebase apache-github/master` or `git merge apache-github/master`. Then git will
ask you resolve conflict. After resolve all the conflicts you can push the new
commit in this branch.
---
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.
---
