sigee commented on issue #217: Issue 223: Code cleanups URL: https://github.com/apache/bookkeeper/pull/217#issuecomment-312596254 @jiazhai, @eolivelli, @sijie, I've merged origin/master into my branch to resolve conflicts, but I see the following message: "This branch cannot be rebased due to conflicts" What should I do to fix it? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
With regards, Apache Git Services
