Github user 1ambda commented on the issue: https://github.com/apache/zeppelin/pull/2239 @soralee Since conflicts are about lint errors, you can simply rebase by 1. keeping your change and run `rebase --continue` 2. then, execute `eslint src --fix` in `zeppelin-web` dir.
--- 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. ---