Github user corneadoug commented on the pull request:
https://github.com/apache/incubator-zeppelin/pull/556#issuecomment-166173543
@cloverhearts don't really understand, but to rebase you need to do:
```
git fetch incubator-zeppelin
git rebase incubator-zeppelin/master
git pull -f (after fixing potential conflicts)
```
---
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.
---
