miinhho commented on PR #5295: URL: https://github.com/apache/zeppelin/pull/5295#issuecomment-4982325982
I resolved the conflict via GitHub, which updated the branch with master and made it mergeable. I realized afterward that this produced a merge commit rather than a rebase. Happy to redo it as a local rebase and force-push if you prefer the linear history. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
