Github user corneadoug commented on the issue:
https://github.com/apache/zeppelin/pull/1363
@Peilin-Yang Actually it's a bit hard for me to help since I can't rebase
for you (Don't have the rights on your branch), but I can see that it is a
pretty messy conflict you got.
For the Rebase process, you need to do a:
```
git fetch apache-github
git rebase apache-github/master
```
(apache-github being a remote for this official repo)
At the first round of conflicts on `paragraph.controller.js`, I would
advise to copy paste the file from master, and replace your local file with
conflict with it.
Then to copy paste the changes of your first commit into it (you can see
the first commit diff
[Here](https://github.com/apache/zeppelin/pull/1492/commits/b92e92ff8821a58c47d7510818ec518414499c83))
After that first round, the other conflicts should be easier
---
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.
---
